Merge lp:~camptocamp/sale-reports/sale-reports-add-so-webkit into lp:~sale-core-editors/sale-reports/7.0

[Nicolas Bessi - Camptocamp]

Port of sale order webkit report + add HTML not and sale conditions

[lp:~camptocamp/sale-reports/sale-reports-add-so-webkit]

9. By Nicolas Bessi - Camptocamp on 2013-01-24

[FIX] import form + licence

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

I just think the dependancies on 'base' and 'report_webkit' modules aren't necessary in __openerp__.py as already inherited from base_header_webkit

review: Approve (code and spelling)

[lp:~camptocamp/sale-reports/sale-reports-add-so-webkit]

10. By Nicolas Bessi - Camptocamp on 2013-01-25

[FIX] dead if statement

Unmerged revisions

=== added directory 'sale_order_webkit'
=== added file 'sale_order_webkit/__init__.py'
--- sale_order_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/__init__.py	2013-01-24 14:15:27 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi, Vincent Renaville, Guewen Baconnier
+#
+#    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 . import sale
+from . import report

=== added file 'sale_order_webkit/__openerp__.py'
--- sale_order_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/__openerp__.py	2013-01-24 14:15:27 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi, Vincent Renaville, Guewen Baconnier
+#
+#    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': 'Sales Order Report using Webkit Library',
+ 'version': '1.0.1',
+ 'category': 'Reports/Webkit',
+ 'description': """
+Sale order webkit
+#################
+
+* Replaces the legacy RML Quotation/Sales Order report by a brand new webkit report.
+* Add header and footer notes
+* Add HTML note on Sale Order lines
+
+Depends on base_header_webkit community addon available here:
+`https://launchpad.net/webkit-utils <https://launchpad.net/webkit-utils>`_
+    """,
+ 'author': 'Camptocamp',
+ 'website': 'http://www.camptocamp.com',
+ 'depends': ['base', 'report_webkit', 'base_headers_webkit', 'sale'],
+ 'init_xml': [],
+ 'update_xml': ['sale_report.xml',
+                'view/sale_view.xml'],
+ 'demo_xml': [],
+ 'test': [],
+ 'installable': True,
+ 'active': False,
+ }

=== added directory 'sale_order_webkit/i18n'
=== added file 'sale_order_webkit/i18n/fr.po'
--- sale_order_webkit/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/i18n/fr.po	2013-01-24 14:15:27 +0000
@@ -0,0 +1,98 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_webkit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-12-12 11:13+0000\n"
+"PO-Revision-Date: 2011-12-12 11:13+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_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:78
+msgid "Your Reference"
+msgstr "Votre Référence"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:35
+msgid "Fax"
+msgstr "Fax"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:32
+msgid "Tel"
+msgstr "Tél"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:94
+msgid "Description"
+msgstr "Description"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:79
+msgid "Quotation Date"
+msgstr "Date du devis"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:99
+msgid "Price"
+msgstr "Prix"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:79
+msgid "Date Ordered"
+msgstr "Date de commande"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:81
+msgid "Payment Term"
+msgstr "Condition de règlement"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:38
+msgid "E-mail"
+msgstr "E-mail"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:74
+msgid "Quotation N°"
+msgstr "Devis N°"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:97
+msgid "Unit Price"
+msgstr "Prix unitaire"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:74
+msgid "Order N°"
+msgstr "N° de commande"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:98
+msgid "Disc.(%)"
+msgstr "Rem.(%)"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:80
+msgid "Salesman"
+msgstr "Vendeur"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:41
+#: report:addons/sale_order_webkit/report/sale_order.mako:95
+msgid "VAT"
+msgstr "TVA"
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:96
+msgid "Quantity"
+msgstr "Quantité"
+

=== added file 'sale_order_webkit/i18n/sale_order_webkit.pot'
--- sale_order_webkit/i18n/sale_order_webkit.pot	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/i18n/sale_order_webkit.pot	2013-01-24 14:15:27 +0000
@@ -0,0 +1,98 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_webkit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-12-12 11:13+0000\n"
+"PO-Revision-Date: 2011-12-12 11:13+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_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:78
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:35
+msgid "Fax"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:32
+msgid "Tel"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:94
+msgid "Description"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:79
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:99
+msgid "Price"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:79
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:81
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:38
+msgid "E-mail"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:74
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:97
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:74
+msgid "Order N°"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:98
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:80
+msgid "Salesman"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:41
+#: report:addons/sale_order_webkit/report/sale_order.mako:95
+msgid "VAT"
+msgstr ""
+
+#. module: sale_order_webkit
+#: report:addons/sale_order_webkit/report/sale_order.mako:96
+msgid "Quantity"
+msgstr ""
+

=== added directory 'sale_order_webkit/report'
=== added file 'sale_order_webkit/report/__init__.py'
--- sale_order_webkit/report/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/report/__init__.py	2013-01-24 14:15:27 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi, Vincent Renaville, Guewen Baconnier
+#
+#    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 . import sale_order

=== added file 'sale_order_webkit/report/sale_order.mako'
--- sale_order_webkit/report/sale_order.mako	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/report/sale_order.mako	2013-01-24 14:15:27 +0000
@@ -0,0 +1,269 @@
+<html>
+<head>
+    <style type="text/css">
+        ${css}
+
+.list_sale_table {
+    border:thin solid #E3E4EA;
+    text-align:center;
+    border-collapse: collapse;
+}
+
+.list_sale_table td {
+    border-top:thin solid #EEEEEE;
+    text-align:right;
+    font-size:12;
+    padding-right:3px;
+    padding-left:3px;
+    padding-top:3px;
+    padding-bottom:3px;
+}
+
+.list_bank_table {
+    text-align:center;
+    border-collapse: collapse;
+}
+
+.list_bank_table td {
+    text-align:left;
+    font-size:12;
+    padding-right:3px;
+    padding-left:3px;
+    padding-top:3px;
+    padding-bottom:3px;
+}
+
+.list_bank_table th {
+    background-color: #EEEEEE;
+    text-align:left;
+    font-size:12;
+    font-weight:bold;
+    padding-right:3px
+    padding-left:3px
+}
+
+.list_sale_table th {
+    background-color: #EEEEEE;
+    border: thin solid #000000;
+    text-align:center;
+    font-size:12;
+    font-weight:bold;
+    padding-right:3px;
+    padding-left:3px;
+}
+
+.list_table thead {
+    display:table-header-group;
+}
+
+
+.list_tax_table {
+}
+.list_tax_table td {
+    text-align:left;
+    font-size:12;
+}
+
+
+.list_table thead {
+    display:table-header-group;
+}
+
+
+.list_total_table {
+    border-collapse: collapse;
+}
+
+.list_total_table td {
+    text-align:right;
+    font-size:12;
+}
+
+.no_bloc {
+    border-top: thin solid  #ffffff ;
+}
+
+
+.list_total_table th {
+    background-color: #F7F7F7;
+    border-collapse: collapse;
+}
+
+tfoot.totals tr:first-child td{
+    padding-top: 15px;
+}
+
+.right_table {
+    right: 4cm;
+    width:"100%";
+}
+
+.std_text {
+    font-size:12;
+}
+
+.note {
+    text-align:left;
+    font-size:10;
+    border-top:thin solid  #ffffff;
+    border-left:thin solid  #ffffff;
+    border-right:thin solid  #ffffff;
+}
+
+
+    </style>
+</head>
+<body>
+    <%page expression_filter="entity"/>
+    <%
+    def carriage_returns(text):
+        return text.replace('\n', '<br />')
+
+    %>
+    %for order in objects:
+    <% setLang(order.partner_id.lang) %>
+    <%
+      quotation = order.state == 'draft'
+    %>
+    <div class="address">
+        <table class="recipient">
+            <tr><td class="name">${order.partner_id.title or ''}  ${order.partner_id.name }</td></tr>
+            <tr><td>${order.partner_id.street or ''}</td></tr>
+            <tr><td>${order.partner_id.street2 or ''}</td></tr>
+            <tr><td>${order.partner_id.zip or ''} ${order.partner_id.city or ''}</td></tr>
+            %if order.partner_id.state_id:
+            <tr><td>${order.partner_id.state_id.name or ''} </td></tr>
+            %endif
+            %if order.partner_id.country_id:
+            <tr><td>${order.partner_id.country_id.name or ''} </td></tr>
+            %endif
+            %if order.partner_id.phone:
+            <tr><td>${_("Tel")}: ${order.partner_id.phone}</td></tr>
+            %endif
+            %if order.partner_id.fax:
+            <tr><td>${_("Fax")}: ${order.partner_id.fax}</td></tr>
+            %endif
+            %if order.partner_id.email:
+            <tr><td>${_("E-mail")}: ${order.partner_id.email}</td></tr>
+            %endif
+            %if order.partner_id.vat:
+            <tr><td>${_("VAT")}: ${order.partner_id.vat}</td></tr>
+            %endif
+        </table>
+
+        <table class="shipping">
+            <tr><td class="address_title">${_("Shipping address:")}</td></tr>
+            <tr><td >${order.partner_id.title or ''}  ${order.partner_id.name }</td></tr>
+            <tr><td>${order.partner_shipping_id.street or ''}</td></tr>
+            <tr><td>${order.partner_shipping_id.street2 or ''}</td></tr>
+            <tr><td>${order.partner_shipping_id.zip or ''} ${order.partner_shipping_id.city or ''}</td></tr>
+            %if order.partner_shipping_id.state_id:
+            <tr><td>${order.partner_shipping_id.state_id.name or ''} </td></tr>
+            %endif
+            %if order.partner_shipping_id.country_id:
+            <tr><td>${order.partner_shipping_id.country_id.name or ''} </td></tr>
+            %endif
+        </table>
+
+        <table class="invoice">
+            <tr><td class="address_title">${_("Invoice address:")}</td></tr>
+            <tr><td>${order.partner_id.title or ''}  ${order.partner_id.name }</td></tr>
+            <tr><td>${order.partner_invoice_id.street or ''}</td></tr>
+            <tr><td>${order.partner_invoice_id.street2 or ''}</td></tr>
+            <tr><td>${order.partner_invoice_id.zip or ''} ${order.partner_invoice_id.city or ''}</td></tr>
+            %if order.partner_invoice_id.state_id:
+            <tr><td>${order.partner_invoice_id.state_id.name or ''} </td></tr>
+            %endif
+            %if order.partner_invoice_id.country_id:
+            <tr><td>${order.partner_invoice_id.country_id.name or ''} </td></tr>
+            %endif
+        </table>
+    </div>
+    <div>
+
+    %if order.note1:
+        <p class="std_text"> ${order.note1| n} </p>
+    %endif
+    </div>
+
+    <h1 style="clear:both;">${quotation and _(u'Quotation N°') or _(u'Order N°') } ${order.name}</h1>
+
+    <table class="basic_table" width="100%">
+        <tr>
+            <td style="font-weight:bold;">${quotation and _("Date Ordered") or _("Quotation Date")}</td>
+            <td style="font-weight:bold;">${_("Your Reference")}</td>
+            <td style="font-weight:bold;">${_("Salesman")}</td>
+            <td style="font-weight:bold;">${_('Payment Term')}</td>
+            <td style="font-weight:bold;">${_('Incoterm')}</td>
+        </tr>
+        <tr>
+            <td>${formatLang(order.date_order, date=True)}</td>
+            <td>${order.client_order_ref or ''}</td>
+            <td>${order.user_id and order.user_id.name or ''}</td>
+            <td>${order.payment_term and order.payment_term.name or ''}</td>
+            <td>${''}</td>
+        </tr>
+    </table>
+
+    <table class="list_sale_table" width="100%" style="margin-top: 20px;">
+        <thead>
+            <tr>
+                <th>${_("Description")}</th>
+                <th class="amount">${_("Quantity")}</th>
+                <th class="amount">${_("UoM")}</th>
+                <th class="amount">${_("Unit Price")}</th>
+                <th>${_("VAT")}</th>
+                <th class="amount">${_("Disc.(%)")}</th>
+                <th class="amount">${_("Price")}</th>
+            </tr>
+        </thead>
+        <tbody>
+            %for line in order.order_line:
+                <tr class="line">
+                    <td style="text-align:left; " >${ line.name }</td>
+                    <td class="amount" width="7.5%">${ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) }</td>
+                    <td style="text-align:center;">${ line.product_uos and line.product_uos.name or line.product_uom.name }</td>
+                    <td class="amount" width="8%">${formatLang(line.price_unit)}</td>
+                    <td style="font-style:italic; font-size: 10;">${ ', '.join([tax.name or '' for tax in line.tax_id]) }</td>
+                    <td class="amount" width="10%">${line.discount and formatLang(line.discount, digits=get_digits(dp='Sale Price')) or ''} ${line.discount and '%' or ''}</td>
+                    <td class="amount" width="13%">${formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'))}&nbsp;${order.pricelist_id.currency_id.symbol}</td>
+                </tr>
+                %if line.formatted_note:
+                    <tr class="line">
+                        <td colspan="7" class="note" style="text-align:left;">${line.formatted_note| n}</td>
+                    </tr>
+                %endif
+            %endfor
+        </tbody>
+        <tfoot class="totals">
+            <tr>
+                <td colspan="5" style="border-style:none"/>
+                <td style="border-style:none"><b>${_("Net Total:")}</b></td>
+                <td class="amount" style="border-style:none">${formatLang(order.amount_untaxed, get_digits(dp='Sale Price'))} ${order.pricelist_id.currency_id.symbol}</td>
+            </tr>
+            <tr>
+                <td colspan="5" style="border-style:none"/>
+                <td style="border-style:none" ><b>${_("Taxes:")}</b></td>
+                <td class="amount"style="border-style:none" >${formatLang(order.amount_tax, get_digits(dp='Sale Price'))} ${order.pricelist_id.currency_id.symbol}</td>
+            </tr>
+            <tr>
+                <td colspan="5" style="border-style:none"/>
+                <td style="border-style:none"><b>${_("Total:")}</b></td>
+                <td class="amount" style="border-style:none">${formatLang(order.amount_total, get_digits(dp='Sale Price'))} ${order.pricelist_id.currency_id.symbol}</td>
+            </tr>
+        </tfoot>
+    </table>
+    <p style="margin-top: 20px;">${order.payment_term and order.payment_term.note or '' | carriage_returns}</p>
+
+    %if order.note :
+        <p class="std_text">${order.note | carriage_returns}</p>
+    %endif
+    %if order.note2:
+        <p class="std_text">${order.note2 | n}</p>
+    %endif
+
+    <p style="page-break-after: always"/>
+    <br/>
+    %endfor
+</body>
+</html>

=== added file 'sale_order_webkit/report/sale_order.py'
--- sale_order_webkit/report/sale_order.py	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/report/sale_order.py	2013-01-24 14:15:27 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi, Vincent Renaville, Guewen Baconnier
+#
+#    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 time
+
+from openerp.report import report_sxw
+from openerp import pooler
+
+
+class SaleOrderReport(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(SaleOrderReport, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({'time': time,
+                                  'company_vat': self._get_company_vat})
+
+    def _get_company_vat(self):
+        res_users_obj = pooler.get_pool(self.cr.dbname).get('res.users')
+        company_vat = res_users_obj.browse(self.cr, self.uid, self.uid).company_id.partner_id.vat
+        if company_vat:
+            return company_vat
+        else:
+            return False
+
+report_sxw.report_sxw('report.sale.order.webkit',
+                      'sale.order',
+                      'addons/sale_report_webkit/report/sale_order.mako',
+                      parser=SaleOrderReport)

=== added file 'sale_order_webkit/sale.py'
--- sale_order_webkit/sale.py	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/sale.py	2013-01-24 14:15:27 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
+#   @author Nicolas Bessi, Vincent Renaville, Guewen Baconnier
+#
+#    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 openerp.osv import orm, fields
+
+
+class SaleConditionText(orm.Model):
+    """Sale order Textual information"""
+    _name = "sale.condition_text"
+    _description = "sale conditions"
+
+    _columns = {
+        'name': fields.char('Condition summary', required=True, size=128),
+        'type': fields.selection([('header', 'Top condition'),
+                                  ('footer', 'Bottom condition')],
+                                 'type', required=True),
+        'text': fields.html('Condition', translate=True, required=True)}
+
+
+class SaleOrder(orm.Model):
+    """Adds condition to SO"""
+
+    _inherit = "sale.order"
+    _description = 'Sale Order'
+
+    _columns = {'text_condition1': fields.many2one('sale.condition_text', 'Header'),
+                'text_condition2': fields.many2one('sale.condition_text', 'Footer'),
+                'note1': fields.html('Header'),
+                'note2': fields.html('Footer')}
+
+    def _set_condition(self, cursor, uid, inv_id, commentid, key):
+        """Set the text of the notes in invoices"""
+        if not commentid:
+            return {}
+        try:
+            lang = self.browse(cursor, uid, inv_id)[0].partner_id.lang
+        except Exception, exc:
+            lang = 'en_US'
+        cond = self.pool.get('sale.condition_text').browse(cursor, uid,
+                                                           commentid, {'lang': lang})
+        return {'value': {key: cond.text}}
+
+    def set_header(self, cursor, uid, inv_id, commentid):
+        return self._set_condition(cursor, uid, inv_id, commentid, 'note1')
+
+    def set_footer(self, cursor, uid, inv_id, commentid):
+        return self._set_condition(cursor, uid, inv_id, commentid, 'note2')
+
+
+class SaleOrderLine(orm.Model):
+    """ADD HTML note to sale order lines"""
+
+    _inherit = "sale.order.line"
+
+    _columns = {'formatted_note': fields.html('Formatted Note')}

=== added file 'sale_order_webkit/sale_report.xml'
--- sale_order_webkit/sale_report.xml	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/sale_report.xml	2013-01-24 14:15:27 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <report id="sale.report_sale_order"
+            name="sale.order.webkit"
+            auto="False"
+            model="sale.order"
+            file="sale_order_webkit/report/sale_order.mako"
+            string="Quotation - Order"
+            webkit_header="base_headers_webkit.base_reports_portrait_header"
+            report_type="webkit"/>
+  </data>
+</openerp>

=== added directory 'sale_order_webkit/view'
=== added file 'sale_order_webkit/view/sale_view.xml'
--- sale_order_webkit/view/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_order_webkit/view/sale_view.xml	2013-01-24 14:15:27 +0000
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+      <!-- Sale condition text views -->
+      <record model="ir.ui.view" id="view_sale_condition_webkit">
+        <field name="name">sale.condition_text.form</field>
+        <field name="model">sale.condition_text</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+          <form string="sale condition text">
+            <field name="name" select="1"/>
+            <field name="type" select="1"/>
+            <field name="text" colspan="4"/>
+          </form>
+        </field>
+      </record>
+      <record model="ir.ui.view" id="view_sale_condition_list_webkit">
+        <field name="name">sale.condition_text.list</field>
+        <field name="model">sale.condition_text</field>
+        <field name="type">tree</field>
+        <field name="priority" eval="6"/>
+        <field name="arch" type="xml">
+          <tree string="Sale condition text">
+            <field name="name" select="1"/>
+            <field name="type" select="1"/>
+            <field name="text"/>
+          </tree>
+        </field>
+      </record>
+      <record model="ir.actions.act_window" id="action_sale_condition_webkit">
+        <field name="name">sale.condition_text</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.condition_text</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_sale_condition_list_webkit"/>
+      </record>
+      <record model="ir.actions.act_window" id="action_sale_condition_form_webkit">
+        <field name="name">sale.condition_text</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.condition_text</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_sale_condition_webkit"/>
+      </record>
+
+      <!-- Overwrite of sale order / sale order line form view -->
+
+
+      <record model="ir.ui.view" id="sale_order_add_notes_in_invoice_line_1">
+        <field name="name">sale.odrer.form.add.notes</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+          <xpath expr="/form/sheet/notebook/page/field/form/field[@name='name']" position="after">
+            <group>
+              <field name="formatted_note" colspan="4"/>
+            </group>
+          </xpath>
+        </field>
+      </record>
+
+      <record model="ir.ui.view" id="view_order_form">
+       <field name="name">sale.order.form.add.notes</field>
+       <field name="model">sale.order</field>
+       <field name="inherit_id" ref="sale.view_order_form"/>
+       <field name="arch" type="xml">
+         <notebook  position="inside">
+           <page string="Conditions">
+             <group>
+               <field name="text_condition1" domain="[('type','=','header')]"
+                      on_change="set_header(text_condition1)" colspan="2"/>
+               <field name="text_condition2" domain="[('type','=','footer')]"
+                      on_change="set_footer(text_condition2)" colspan="2"/>
+               <field name="note1" colspan="4" nolabel="1" placeholder="Your top conditions here"/>
+               <field name="note2" colspan="4" nolabel="1" placeholder="Your bottom conditions here"/>
+             </group>
+           </page>
+         </notebook>
+       </field>
+     </record>
+
+
+    </data>
+</openerp>