← Back to team overview

clearcorp team mailing list archive

lp:~wg.clearcorp/openerp-ccorp-addons/6.1-sale_order_ccorp_report into lp:openerp-ccorp-addons

 

Willy Andres Gomez Solorzano has proposed merging lp:~wg.clearcorp/openerp-ccorp-addons/6.1-sale_order_ccorp_report into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~wg.clearcorp/openerp-ccorp-addons/6.1-sale_order_ccorp_report/+merge/132142

Added sale_order_extended to customize footers and delay times. Customized sale_order_ccorp_report/report/sale_order.mako,added global discount to view and report
-- 
https://code.launchpad.net/~wg.clearcorp/openerp-ccorp-addons/6.1-sale_order_ccorp_report/+merge/132142
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.
=== modified file 'sale_order_ccorp_report/__openerp__.py'
--- sale_order_ccorp_report/__openerp__.py	2012-06-30 22:41:06 +0000
+++ sale_order_ccorp_report/__openerp__.py	2012-10-30 15:26:38 +0000
@@ -36,14 +36,13 @@
     "images" : [],
     "icon" : False,
     "depends" : [
-        'sale',
+        'sale_order_global_discount',
+        'sale_order_extended',
         'report_webkit',
         ],
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : [
-        'ccorp_sale_webkit_report.xml',
-        ],
+    "update_xml" : ['ccorp_sale_webkit_report.xml'],
     "test" : [],
     "auto_install": False,
     "application": False,

=== removed file 'sale_order_ccorp_report/i18n/ccorp_sale.pot'
--- sale_order_ccorp_report/i18n/ccorp_sale.pot	2012-06-30 22:41:06 +0000
+++ sale_order_ccorp_report/i18n/ccorp_sale.pot	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.1\n"
-"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-03-14 17:23+0000\n"
-"PO-Revision-Date: 2011-03-14 17:23+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: ccorp_sale
-#: report:sale_order.layout_ccorp:0
-msgid "Order Nº "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Quotation Nº "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Date: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "ID Num.: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Tel-fax: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Email: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Web: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Address:"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Phone: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Page: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Thank you for choosing us."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Qty."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "[Code] Description / (Taxes)"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Disc."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Total Price"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Discount"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Taxes"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "TOTAL"
-msgstr ""

=== removed file 'sale_order_ccorp_report/i18n/ccorp_sale_webkit.pot'
--- sale_order_ccorp_report/i18n/ccorp_sale_webkit.pot	2012-06-30 22:41:06 +0000
+++ sale_order_ccorp_report/i18n/ccorp_sale_webkit.pot	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* ccorp_sale
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-10-06 19:16+0000\n"
-"PO-Revision-Date: 2011-10-06 19:16+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: ccorp_sale
-#: model:ir.module.module,description:ccorp_sale.module_meta_information
-msgid "ClearCorp 'sale' modifications:\n"
-"    Reports:\n"
-"      * Sale Order / Quotation\n"
-"    "
-msgstr "ClearCorp 'sale' modifications:\n"
-"    Reports:\n"
-"      * Sale Order / Quotation\n"
-"    "
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:89
-#: report:report.sale.order.layout_ccorp:93
-msgid "Sub Total"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:48
-msgid "Invoice address"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:26
-msgid "Date:"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:31
-msgid "ID Num."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:77
-msgid "Note"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
-msgid "Unit Price"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:18
-msgid "Order N°"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:39
-msgid "Email"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
-msgid "Total Price"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:42
-msgid "Confirmation date"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:35
-msgid "Phone"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:38
-msgid "Ref."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
-msgid "[Code] Description / (Taxes)"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:48
-msgid "Shipping address"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:90
-#: report:report.sale.order.layout_ccorp:94
-msgid "Taxes"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:104
-msgid "Payment Note"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:101
-msgid "Order Notes"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
-msgid "Qty"
-msgstr ""
-
-#. module: ccorp_sale
-#: model:ir.module.module,shortdesc:ccorp_sale.module_meta_information
-msgid "ClearCorp sale module modifications"
-msgstr "ClearCorp sale module modifications"
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:15
-msgid "Quotation N°"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:91
-#: report:report.sale.order.layout_ccorp:95
-msgid "Total"
-msgstr ""
-

=== modified file 'sale_order_ccorp_report/i18n/es.po'
--- sale_order_ccorp_report/i18n/es.po	2012-10-20 05:36:35 +0000
+++ sale_order_ccorp_report/i18n/es.po	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-# Spanish translation for openerp-ccorp-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openerp-ccorp-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-ccorp-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-14 17:23+0000\n"
-"PO-Revision-Date: 2012-06-25 08:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@xxxxxx>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-20 05:36+0000\n"
-"X-Generator: Launchpad (build 16165)\n"
-
-#. module: ccorp_sale
-#: report:sale_order.layout_ccorp:0
-msgid "Order Nº "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Quotation Nº "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Date: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "ID Num.: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Tel-fax: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Email: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Web: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Address:"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Phone: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Page: "
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Thank you for choosing us."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Qty."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "[Code] Description / (Taxes)"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Disc."
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Total Price"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Discount"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "Taxes"
-msgstr ""
-
-#. module: ccorp_sale
-#: report:sale.order.layout_ccorp:0
-msgid "TOTAL"
-msgstr ""

=== target is u'es_CR.po'
=== modified file 'sale_order_ccorp_report/i18n/es_CR.po'
--- sale_order_ccorp_report/i18n/es_CR.po	2012-06-30 22:41:06 +0000
+++ sale_order_ccorp_report/i18n/es_CR.po	2012-10-30 15:26:38 +0000
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* ccorp_sale
+#	* sale_order_ccorp_report
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-10-06 19:16+0000\n"
-"PO-Revision-Date: 2011-10-06 19:16+0000\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-29 21:58+0000\n"
+"PO-Revision-Date: 2012-10-29 21:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,131 +15,155 @@
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: ccorp_sale
-#: model:ir.module.module,description:ccorp_sale.module_meta_information
-msgid "ClearCorp 'sale' modifications:\n"
-"    Reports:\n"
-"      * Sale Order / Quotation\n"
-"    "
-msgstr "ClearCorp 'sale' modifications:\n"
-"    Reports:\n"
-"      * Sale Order / Quotation\n"
-"    "
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:89
-#: report:report.sale.order.layout_ccorp:93
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:105
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:110
 msgid "Sub Total"
-msgstr "Sub Total"
+msgstr "Subtotal"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:48
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:51
 msgid "Invoice address"
-msgstr "Dirección de Factura"
+msgstr "Dirección factura"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:26
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:26
 msgid "Date:"
 msgstr "Fecha:"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:31
-msgid "ID Num."
-msgstr "Céd. Jur."
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:77
-msgid "Note"
-msgstr "Nota"
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
+#. 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."
+
+#. 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
 msgid "Unit Price"
-msgstr "Precio Unitario"
+msgstr "Precio unitario"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:18
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:18
 msgid "Order N°"
-msgstr "Orden N°"
+msgstr "N° Orden"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
+#. 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
 msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:39
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:41
 msgid "Email"
 msgstr "Email"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
-msgid "Total Price"
-msgstr "Precio Total"
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:42
+#. 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:107
+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 de Confirmación"
+msgstr "Fecha confirmación"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:35
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:35
 msgid "Phone"
 msgstr "Tel."
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:38
+#. 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
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:39
 msgid "Ref."
 msgstr "Ref."
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:125
+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
 msgid "[Code] Description / (Taxes)"
-msgstr "[Cód.] Descripción / (Imp.)"
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:48
+msgstr "[Cod] Descripción / (Imp.)"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:125
+msgid "Authorized by"
+msgstr "Autorizado por"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:51
 msgid "Shipping address"
-msgstr "Dirección de envío"
+msgstr "Dirección envío"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:90
-#: report:report.sale.order.layout_ccorp:94
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:106
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:111
 msgid "Taxes"
 msgstr "Impuestos"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:104
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:121
 msgid "Payment Note"
-msgstr "Nota de pago"
-
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:101
+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:118
 msgid "Order Notes"
-msgstr "Nota de orden"
+msgstr "Nota Orden"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:62
-#: report:report.sale.order.layout_ccorp:64
+#. 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
 msgid "Qty"
 msgstr "Cant."
 
-#. module: ccorp_sale
-#: model:ir.module.module,shortdesc:ccorp_sale.module_meta_information
-msgid "ClearCorp sale module modifications"
-msgstr "ClearCorp sale module modifications"
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:31
+msgid "ID Num"
+msgstr "Cód. Cliente."
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:15
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:15
 msgid "Quotation N°"
-msgstr "Quotation N°"
+msgstr "N° Cotización"
 
-#. module: ccorp_sale
-#: report:report.sale.order.layout_ccorp:91
-#: report:report.sale.order.layout_ccorp:95
+#. 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:112
 msgid "Total"
 msgstr "Total"
 
+#. module: sale_order_ccorp_report
+#: model:ir.model,name:sale_order_ccorp_report.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+

=== added file 'sale_order_ccorp_report/report/footer.html'
--- sale_order_ccorp_report/report/footer.html	1970-01-01 00:00:00 +0000
+++ sale_order_ccorp_report/report/footer.html	2012-10-30 15:26:38 +0000
@@ -0,0 +1,34 @@
+<html>
+	<head>
+		<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+		<script>
+			function subst() {
+			var vars={};
+			var x=document.location.search.substring(1).split('&');
+			for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			for(var i in x) {
+			var y = document.getElementsByClassName(x[i]);
+			for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+				}
+			}
+		</script>
+		<style type="text/css">
+			${css}
+		</style>
+	</head>
+	<body class = "footer" onload="subst()">
+		<table class = "footer_table">
+			<tr>
+				<td><p class ="company_footer">Favor realizar pagos a nombre de Diseños Metalmecánicos S.A. cédula jurídica 3-101-102043. C. Bancarias: BANCO ($USD)  - BANCO (¢CRC) </p></td>
+			</tr>
+			<tr>
+				<td><p class ="company_footer">Si realiza el pago en colones (CRC), por favor utilizar el tipo de cambio al día de la fecha de pago del BCCR.</p></td>
+				<td style="text-align:right;font-size:12;">Página <span class="page"/></td><td style="text-align:left;font-size:12;">  de <span class="topage"/></td>
+			</tr>
+			<tr>
+				<td><p class ="company_footer">Emitida conforme lo establecido en la resolución de Facturación Electrónica, N° DGT-22-07 del diecisiete de setiembre de dos mil siete de la Dirección General de Tributación </p></td>
+			</tr>
+        </table>
+    </body>
+</html>

=== added file 'sale_order_ccorp_report/report/header.html'
--- sale_order_ccorp_report/report/header.html	1970-01-01 00:00:00 +0000
+++ sale_order_ccorp_report/report/header.html	2012-10-30 15:26:38 +0000
@@ -0,0 +1,59 @@
+<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                }
+            }
+        </script>
+        <style type="text/css">
+            ${css}
+        </style>
+    </head>
+    <body class = "header" onload="subst()">
+        <table class="header-table" cellspacing = "3">
+            <tbody>
+                <tr>
+                    <td class="company_logo">${helper.embed_logo_by_name('invoice_logo', height=94)|n}</td>
+                    <td>
+                        <table class="company_data">
+                            <tr class = "title">
+                                <td>${company.partner_id.name |entity}</td>
+                                <td>${_("Address")}</td>
+                            </tr>
+                            <tr>
+                                <td>${_("ID Num")}: ${company.company_registry | entity}</td>
+                                <td>${company.partner_id.address[0].street or ''|entity}</td>
+                            </tr>
+                            <tr>
+                                <td>${_("Tel-fax")}: ${company.partner_id.address[0].phone or '-'|entity}</td>
+                                <td>${company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address[0].city or ''|entity}</td>
+                            </tr>
+                            <tr>
+                                <td>${_("E-mail")}: ${company.partner_id.address[0].email or '-'|entity}</td>
+                                %if company.partner_id.address[0].country_id :
+                                    <td>${company.partner_id.address[0].state_id.name  or ''|entity}, ${company.partner_id.address[0].country_id.name or ''|entity} </td>
+                                %else:
+                                    <td>&nbsp;</td>
+                                %endif
+                            </tr>
+                            <tr>
+                                <td>${_("Web")}: ${company.website or '-'|entity}</td>
+                                <td></td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        
+        <p class = "slogan">${company.rml_header1}</p>
+        <hr />${_debug or ''|n} </body>
+</html> 

=== modified file 'sale_order_ccorp_report/report/sale_order.mako'
--- sale_order_ccorp_report/report/sale_order.mako	2012-06-30 22:41:06 +0000
+++ sale_order_ccorp_report/report/sale_order.mako	2012-10-30 15:26:38 +0000
@@ -28,18 +28,21 @@
 						${formatLang(so.date_order, date=True)|entity}
 					%endif
 				</td>
-				<td>${_("ID Num.")}: ${so.partner_id.ref or '-'|entity}</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>
-				<td>${_("Ref.")}: ${so.client_order_ref != "" and so.client_order_ref or ''|entity}</td>
+				%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>&nbsp;</td><td>&nbsp;</td>
 			</tr>
 			<tr class = "zone_break"><td>&nbsp;</td><td>&nbsp;</td></tr>
@@ -57,14 +60,24 @@
 				<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">
-			%if discount(so) != 0:
-				<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Disc.(%)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+			%if company.show_sale_order_footer :	
+				%if discount(so) != 0:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Delay")}</th><th>${_("Disc.(%)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%else:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Delay")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%endif
 			%else:
-				<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%if discount(so) != 0:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Disc.(%)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%else:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%endif
 			%endif
+		
 		<tbody>
-		<%i = 0 %>
+		<%i = 0%>
 		%for line in so.order_line :
 			%if i% 2 == 0:
 				<tr class = "even">
@@ -73,6 +86,9 @@
 			%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
@@ -81,18 +97,32 @@
 					<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)} ${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>
 		<%i +=1%>
-		%endfor
+		%endfor		
 		%if discount(so) != 0:
-			<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
-			<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
-			<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_total)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%if company.show_sale_order_footer :
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted + so.amount_tax - so.amount_discounted )} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%else:
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted + so.amount_tax - so.amount_discounted )} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%endif
 		%else:
-			<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
-			<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
-			<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_total)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%if company.show_sale_order_footer :
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted + so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%else:
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_untaxed_not_discounted + so.amount_tax)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%endif
 		%endif
 		</tbody>
 		</table>
@@ -104,6 +134,17 @@
 				<tr><td><b>${_("Payment Note")}:</b>${format(so.payment_term and so.payment_term.note)}</td></tr>
 			%endif
 		</table>
+		<br>
+		<br>
+		<table id="responsibles_table">
+			<tr><td style="border-top:1px solid"><b>${_("Realized by")}:</b> ${so.user_id.name}</td><td style="border-style:none"/><td style="border-top:1px solid"><b>${_("Authorized by")}:_________________</b></td></tr>	
+			<!--<tr><td style="border-style:none"> ${company.sale_order_footer}</td><td style="border-style:none"/></tr>-->
+		</table>
+		%if company.show_sale_order_footer :
+			<div id="custom_footer">
+				<p>${company.sale_order_footer}</p>
+			<div/>
+		%endif
 	</div>
 	<p style="page-break-after:always"></p>
 %endfor

=== modified file 'sale_order_ccorp_report/report/sale_order.py'
--- sale_order_ccorp_report/report/sale_order.py	2012-06-30 22:41:06 +0000
+++ sale_order_ccorp_report/report/sale_order.py	2012-10-30 15:26:38 +0000
@@ -49,6 +49,6 @@
 report_sxw.report_sxw(
     'report.sale.order.layout_ccorp',
     'sale.order',
-    'addons/ccorp_sale/report/sale_order.mako',
+    'addons/sale_order_ccorp_report/report/sale_order.mako',
     parser=sale_order_ccorp
 )

=== added file 'sale_order_ccorp_report/report/style.css'
--- sale_order_ccorp_report/report/style.css	1970-01-01 00:00:00 +0000
+++ sale_order_ccorp_report/report/style.css	2012-10-30 15:26:38 +0000
@@ -0,0 +1,131 @@
+ .header {
+				padding : 200px 10px 5px 10px;
+				border:0; margin: 0;
+			}
+			.header-table {
+				width: 100%;
+				padding-top: 8%;
+			}
+			.partner-table {
+				width: 100%;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 12;
+			}
+
+			#data-table {
+				width: 100%;
+				padding-top: 20px;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 10;
+			}
+			#data-table th{
+				border-bottom:2px solid black;
+				text-align:center;
+				font-size:12;
+				font-weight:bold;
+                                /*
+				padding-right:3px;
+				padding-left:3px;
+*/
+			}
+			#data-table thead {
+				display:table-header-group;
+			}
+
+			.title {
+				font-size:16;
+				font-weight: bold;
+			}
+
+			td.company_logo{
+				padding-top: 12px;
+				padding-bottom: 5px;
+			}
+			.company_address{
+				width : 100%;
+				text-align: right;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 13;
+			}
+
+			.company_data {
+				width : 100%;
+				text-align: left;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 13;
+				
+			}
+			
+			.company_footer {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 8.4;
+				font-style : italic;
+			}
+			.footer {
+				border-top: 1px solid black; 
+				width: 100%;
+				border:0; margin: 0;
+				padding-bottom: 300px;
+			}
+
+			.data {
+				padding : 5px 10px 10px 10px;
+				border:0; margin: 0;
+			}
+
+			.footer_table {
+				width: 100%;
+				padding-bottom: 150px;
+				border-top: 1px solid black;
+			}
+			
+			.slogan {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 10;
+				font-style : italic;
+				color : #888888;
+			}
+			
+			#notes_table {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 12;
+				font-style : italic;
+				width:65%;
+				border-collapse:separate;
+				border-spacing:10px;
+			}
+			#notes_table td{
+				background-color: #eee;
+				padding: 10px
+			}
+			
+			.document_data {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 13;
+			}
+			
+			#data-table tbody tr.even td {
+				background-color: #eee;
+			}
+			#data-table tbody tr.odd  td {
+				background-color: #fff;
+			}
+			
+			.notes{
+				padding-top : 0px;
+				margin-left: 5px;
+				font-style : italic;
+			}
+			#desc_col{
+				width : 330px;
+			}
+			#desc_col_po{
+				width : 380px;
+			}
+			#responsibles_table td{
+				padding-top: 20px;
+				font-size: 12;
+			}
+			#custom_footer p{
+				font-size: 10;
+			}

=== added directory 'sale_order_extended'
=== added file 'sale_order_extended/__init__.py'
--- sale_order_extended/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_order_extended/__init__.py	2012-10-30 15:26:38 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+import sale_order_extended

=== added file 'sale_order_extended/__openerp__.py'
--- sale_order_extended/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_order_extended/__openerp__.py	2012-10-30 15:26:38 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    "name" : 'CLEARCORP Sale Order Extended',
+    "version" : '2.0',
+    "author" : 'CLEARCORP S.A.',
+    #easy, normal, expert
+    'complexity': 'normal',
+    "description": """
+Customization from sale.order to apply due dates in views and reports, and custom footer for report
+    """,
+    "category": 'Sales',
+    "sequence": 4,
+    "website" : "http://clearcorp.co.cr";,
+    "images" : [],
+    "icon" : False,
+    "depends" : [
+        'sale'],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ['sale_order_extended_view.xml'],
+    "test" : [],
+    "auto_install": False,
+    "application": False,
+    "installable": True,
+    'license': 'AGPL-3',
+}

=== added directory 'sale_order_extended/i18n'
=== added symlink 'sale_order_extended/i18n/es.po'
=== target is u'es_CR.po'
=== added file 'sale_order_extended/i18n/es_CR.po'
--- sale_order_extended/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ sale_order_extended/i18n/es_CR.po	2012-10-30 15:26:38 +0000
@@ -0,0 +1,67 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_extended
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-29 16:03+0000\n"
+"PO-Revision-Date: 2012-10-29 16:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_order_extended
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia de la compra debe ser única por compañía!"
+
+#. module: sale_order_extended
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: sale_order_extended
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: sale_order_extended
+#: model:ir.model,name:sale_order_extended.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_order_extended
+#: model:ir.model,name:sale_order_extended.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: sale_order_extended
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: sale_order_extended
+#: view:res.company:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale_order_extended
+#: field:res.company,show_sale_order_footer:0
+msgid "Show Sale Order Footer"
+msgstr "Mostrar pie de pagina de Orden de Venta"
+
+#. module: sale_order_extended
+#: field:res.company,sale_order_footer:0
+msgid "Sale Order Footer"
+msgstr "Pie de pagina de Orden de Venta"
+
+#. module: sale_order_extended
+#: field:sale.order,expiration_date:0
+msgid "Expiration date"
+msgstr "Fecha vencimiento"
+

=== added file 'sale_order_extended/sale_order_extended.py'
--- sale_order_extended/sale_order_extended.py	1970-01-01 00:00:00 +0000
+++ sale_order_extended/sale_order_extended.py	2012-10-30 15:26:38 +0000
@@ -0,0 +1,23 @@
+from osv import osv
+from osv import fields
+import os
+import tools
+from tools.translate import _
+from tools.safe_eval import safe_eval as eval
+
+class res_company(osv.osv):
+      _inherit = 'res.company'
+      _columns =  {
+        'sale_order_footer': fields.text('Sale Order Footer'),
+        'show_sale_order_footer': fields.boolean('Show Sale Order Footer'),       
+            } 
+      _defaults = {
+        'show_sale_order_footer': False        
+            }
+      
+
+class sale_order(osv.osv):
+      _inherit = 'sale.order'
+      _columns =  {
+        'expiration_date': fields.date('Expiration date'),       
+            } 

=== added file 'sale_order_extended/sale_order_extended_view.xml'
--- sale_order_extended/sale_order_extended_view.xml	1970-01-01 00:00:00 +0000
+++ sale_order_extended/sale_order_extended_view.xml	2012-10-30 15:26:38 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<openerp>
+	<data>
+		<record id="view_company_form_inherit" model="ir.ui.view">
+			<field name="name">res.company.form.inherit</field>
+			<field name="model">res.company</field>
+			<field name="inherit_id" ref="base.view_company_form"/>
+			<field name="priority">33</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<page string="Configuration" position="inside">
+					<separator string="Sales" colspan="4"/>
+						<field name="sale_order_footer" colspan="2"/>
+						<field name="show_sale_order_footer" colspan="2"/>
+				</page>
+			</field>
+		</record>
+		
+		<record id="view_order_form_inherit" model="ir.ui.view">
+			<field name="name">sale.order.form.inherit</field>
+			<field name="model">sale.order</field>
+			<field name="inherit_id" ref="sale.view_order_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="client_order_ref" position="after">
+					<field name="expiration_date"/> 
+				</field>
+			</field>
+		</record>
+	</data>
+</openerp>
\ No newline at end of file

=== added directory 'sale_order_global_discount'
=== added file 'sale_order_global_discount/__init__.py'
--- sale_order_global_discount/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_order_global_discount/__init__.py	2012-10-30 15:26:38 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+import sale_order_global_discount

=== added file 'sale_order_global_discount/__openerp__.py'
--- sale_order_global_discount/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_order_global_discount/__openerp__.py	2012-10-30 15:26:38 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    "name" : 'CLEARCORP Sale Order Global Discount',
+    "version" : '2.0',
+    "author" : 'CLEARCORP S.A.',
+    #easy, normal, expert
+    'complexity': 'normal',
+    "description": """
+Customization from sale.order to apply global discounts
+    """,
+    "category": 'Sales',
+    "sequence": 4,
+    "website" : "http://clearcorp.co.cr";,
+    "images" : [],
+    "icon" : False,
+    "depends" : [
+        'sale'],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : ['sale_order_global_discount_view.xml'],
+    "test" : [],
+    "auto_install": False,
+    "application": False,
+    "installable": True,
+    'license': 'AGPL-3',
+}

=== added directory 'sale_order_global_discount/i18n'
=== added symlink 'sale_order_global_discount/i18n/es.po'
=== target is u'es_CR.po'
=== added file 'sale_order_global_discount/i18n/es_CR.po'
--- sale_order_global_discount/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ sale_order_global_discount/i18n/es_CR.po	2012-10-30 15:26:38 +0000
@@ -0,0 +1,53 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_global_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-29 16:04+0000\n"
+"PO-Revision-Date: 2012-10-29 16:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_order_global_discount
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia de la compra debe ser única por compañía!"
+
+#. module: sale_order_global_discount
+#: view:sale.order:0
+msgid "Untaxed amount(Not Discounted)"
+msgstr "Monto sin impuesto(Sin Descuento)"
+
+#. module: sale_order_global_discount
+#: field:sale.order,amount_discounted:0
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: sale_order_global_discount
+#: model:ir.model,name:sale_order_global_discount.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_order_global_discount
+#: field:sale.order,amount_untaxed_not_discounted:0
+#: field:sale.order.line,price_subtotal_not_discounted:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale_order_global_discount
+#: model:ir.model,name:sale_order_global_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale_order_global_discount
+#: field:sale.order,order_discount:0
+msgid "Untaxed Amount"
+msgstr "Monto sin impuesto"
+

=== added file 'sale_order_global_discount/sale_order_global_discount.py'
--- sale_order_global_discount/sale_order_global_discount.py	1970-01-01 00:00:00 +0000
+++ sale_order_global_discount/sale_order_global_discount.py	2012-10-30 15:26:38 +0000
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from datetime import datetime, timedelta
+from dateutil.relativedelta import relativedelta
+import time
+import pooler
+from osv import fields, osv
+from tools.translate import _
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, float_compare
+import decimal_precision as dp
+import netsvc
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    _description = 'Order Line'
+    
+    def _amount_line_no_discount(self, cr, uid, ids, field_name, arg, context=None):
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        res = {}
+        if context is None:
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            price = line.price_unit
+            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
+        return res
+
+    _columns = {
+        'price_subtotal_not_discounted': fields.function(_amount_line_no_discount, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
+        
+    }
+    
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    _description = 'Sales Order'
+    
+    def _amount_line_tax_no_discount(self, cr, uid, line, context=None):
+        val = 0.0
+        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
+            val += c.get('amount', 0.0)
+        return val
+
+    def _amount_all_ccorp(self, cr, uid, ids, field_name, arg, context=None):
+        cur_obj = self.pool.get('res.currency')
+        res = {}
+        for order in self.browse(cr, uid, ids, context=context):
+            res[order.id] = {
+                'order_discount': 0.0,
+                'amount_discounted': 0.0,
+                'amount_untaxed_not_discounted': 0.0,
+            }
+            for line in order.order_line:
+                res[order.id]['amount_untaxed_not_discounted'] += line.price_subtotal_not_discounted
+                res[order.id]['amount_discounted'] += line.price_subtotal_not_discounted - line.price_subtotal
+            if res[order.id]['amount_untaxed_not_discounted'] == 0:
+                res[order.id]['order_discount'] = 0
+            else:
+                res[order.id]['order_discount'] = 100 * res[order.id]['amount_discounted'] / res[order.id]['amount_untaxed_not_discounted']
+        return res
+    def _get_order_ccorp(self, cr, uid, ids, context=None):
+        return self.pool.get('sale.order')._get_order(cr, uid, ids, context)
+    _columns = {
+        'order_discount': fields.function(_amount_all_ccorp, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums'),
+        'amount_discounted': fields.function(_amount_all_ccorp, digits_compute= dp.get_precision('Sale Price'), string='Discount',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums'),
+        'amount_untaxed_not_discounted': fields.function(_amount_all_ccorp, digits_compute= dp.get_precision('Sale Price'), string='Subtotal',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums'),
+                }
+    
+    
+    
\ No newline at end of file

=== added file 'sale_order_global_discount/sale_order_global_discount_view.xml'
--- sale_order_global_discount/sale_order_global_discount_view.xml	1970-01-01 00:00:00 +0000
+++ sale_order_global_discount/sale_order_global_discount_view.xml	2012-10-30 15:26:38 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<openerp>
+	<data>
+		<record id="view_order_form_inherit" model="ir.ui.view">
+			<field name="name">sale.order.form.inherit</field>
+			<field name="model">sale.order</field>
+			<field name="inherit_id" ref="sale.view_order_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="price_subtotal" position="replace">
+						<field name="price_subtotal_not_discounted"/>
+				</field>
+				
+				<field name="amount_untaxed" position="replace">
+						<field name="amount_untaxed_not_discounted" sum="Untaxed amount(Not Discounted)"/>
+				</field>
+				
+				<field name="amount_tax" position="before">
+					<field name="amount_discounted"/>
+				</field>
+				
+			</field>
+		</record>
+	</data>
+</openerp>
\ No newline at end of file


Follow ups