From c3cf05af3ef9a5055981594163fcfbd71c9be811 Mon Sep 17 00:00:00 2001
From: Mansi Gandhi <mag@odoo.com>
Date: Tue, 13 Dec 2016 12:03:09 +0530
Subject: [PATCH] [IMP] sale,account: Move pro-forma to sales and make it a
 quote report

Purpose
=======

we use to make proforma invoice to get payment before the creation of the real invoice. In the current odoo, the proforma state is too late. Because you have to confirm the SO to generate the draft invoice and so the proforma. But, if you do that, you have generated a subscription or a delivery order in the mean time. A proforma is actually a quote. In old ERP they used to make proforma to send a quote  and don't generate invoice number.

Specification
=============

- Remove everything related to Proforma from accounting
    - Remove the configuration of pro-forma from account setting
    - Invoice form, remove "Pro-froma" button, stage, report title
- Add proforma configuration option in sales setting under "Quotation and Sales" section
- In quote/sale, add Pro-forma under Print
- A pro-forma is a quote, but the title of the report is Pro-Forma and not Quotation
- button (secondary) on quotation form "SEND PRO-FORMA" to send proforma by mail attached with related report.
   - button
   - mail template
   - when preparing a quotation this button is visible but if even one invoice this should be invisible (as confirming SO doesn't generate invoice currently)
---
 .../data/email_template_data_invoice.xml      |  2 +-
 addons/account/models/account_invoice.py      | 16 ++++----------
 .../models/account_journal_dashboard.py       |  2 +-
 addons/account/models/res_config.py           |  3 ---
 .../account/report/account_invoice_report.py  |  2 --
 .../report/account_invoice_report_view.xml    |  3 +--
 addons/account/security/account_security.xml  |  6 -----
 .../tests/test_account_customer_invoice.py    |  6 -----
 addons/account/views/account_invoice_view.xml | 22 ++++++++-----------
 .../views/account_journal_dashboard_view.xml  |  2 +-
 addons/account/views/report_invoice.xml       |  1 -
 addons/account/views/res_config_view.xml      | 11 ----------
 .../account/wizard/account_invoice_refund.py  |  4 ++--
 .../account/wizard/account_invoice_state.py   |  4 ++--
 addons/account_cancel/views/account_views.xml |  4 ++--
 addons/membership/models/membership.py        |  2 +-
 addons/membership/models/partner.py           |  2 +-
 .../report_intrastat_invoice_template.xml     |  1 -
 addons/sale/data/mail_template_data.xml       |  9 ++++++--
 addons/sale/models/sale.py                    |  8 +++----
 addons/sale/models/sale_config_settings.py    |  2 ++
 addons/sale/report/sale_report.py             | 14 ++++++++++++
 addons/sale/report/sale_report.xml            | 12 ++++++++++
 addons/sale/report/sale_report_templates.xml  |  9 ++++++--
 addons/sale/security/sale_security.xml        |  5 +++++
 .../sale/views/sale_config_settings_views.xml | 11 ++++++++++
 addons/sale/views/sale_views.xml              |  2 ++
 27 files changed, 89 insertions(+), 76 deletions(-)

diff --git a/addons/account/data/email_template_data_invoice.xml b/addons/account/data/email_template_data_invoice.xml
index 94a9be1cb77..e1442d6b421 100644
--- a/addons/account/data/email_template_data_invoice.xml
+++ b/addons/account/data/email_template_data_invoice.xml
@@ -29,7 +29,7 @@
 % if object.number:
 invoice <strong>${object.number}</strong>
 % else:
-pro-forma invoice
+invoice
 % endif
 % if object.origin:
 (with reference: ${object.origin})
diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 7c18865b558..58c2b72ceb1 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -221,8 +221,6 @@ class AccountInvoice(models.Model):
 
     state = fields.Selection([
             ('draft','Draft'),
-            ('proforma', 'Pro-forma'),
-            ('proforma2', 'Pro-forma'),
             ('open', 'Open'),
             ('paid', 'Paid'),
             ('cancel', 'Cancelled'),
@@ -549,18 +547,12 @@ class AccountInvoice(models.Model):
                     attachment.unlink()
         return True
 
-    @api.multi
-    def action_invoice_proforma2(self):
-        if self.filtered(lambda inv: inv.state != 'draft'):
-            raise UserError(_("Invoice must be a draft in order to set it to Pro-forma."))
-        return self.write({'state': 'proforma2'})
-
     @api.multi
     def action_invoice_open(self):
         # lots of duplicate calls to action_invoice_open, so we remove those already open
         to_open_invoices = self.filtered(lambda inv: inv.state != 'open')
-        if to_open_invoices.filtered(lambda inv: inv.state not in ['proforma2', 'draft']):
-            raise UserError(_("Invoice must be in draft or Pro-forma state in order to validate it."))
+        if to_open_invoices.filtered(lambda inv: inv.state != 'draft'):
+            raise UserError(_("Invoice must be in draft state in order to validate it."))
         to_open_invoices.action_date_assign()
         to_open_invoices.action_move_create()
         return to_open_invoices.invoice_validate()
@@ -583,8 +575,8 @@ class AccountInvoice(models.Model):
 
     @api.multi
     def action_invoice_cancel(self):
-        if self.filtered(lambda inv: inv.state not in ['proforma2', 'draft', 'open']):
-            raise UserError(_("Invoice must be in draft, Pro-forma or open state in order to be cancelled."))
+        if self.filtered(lambda inv: inv.state not in ['draft', 'open']):
+            raise UserError(_("Invoice must be in draft or open state in order to be cancelled."))
         return self.action_cancel()
 
     @api.multi
diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index d70eaa807bb..3498b71fe7f 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -175,7 +175,7 @@ class account_journal(models.Model):
             number_waiting = 0
             for result in query_results:
                 cur = self.env['res.currency'].browse(result.get('currency'))
-                if result.get('state') in ['draft', 'proforma', 'proforma2']:
+                if result.get('state') == 'draft':
                     number_draft += 1
                     sum_draft += cur.compute(result.get('amount_total'), currency)
                 elif result.get('state') == 'open':
diff --git a/addons/account/models/res_config.py b/addons/account/models/res_config.py
index dea258f4350..cf94197d1a7 100644
--- a/addons/account/models/res_config.py
+++ b/addons/account/models/res_config.py
@@ -32,9 +32,6 @@ class AccountConfigSettings(models.TransientModel):
     module_account_deferred_revenue = fields.Boolean(string="Revenue Recognition")
     module_account_budget = fields.Boolean(string='Budget Management')
     module_account_reports = fields.Boolean("Dynamic Reports")
-    group_proforma_invoices = fields.Boolean(string='Allow pro-forma invoices',
-        implied_group='account.group_proforma_invoices',
-        help="Allows you to put invoices in pro-forma state.")
     module_account_reports_followup = fields.Boolean("Enable payment followup management")
     default_sale_tax_id = fields.Many2one('account.tax', string="Default Sale Tax",
         default_model="account.config.settings", company_dependent=True, oldname="default_sale_tax")
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index f75fffea723..cf9b5738a47 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -55,8 +55,6 @@ class AccountInvoiceReport(models.Model):
         ], readonly=True)
     state = fields.Selection([
         ('draft', 'Draft'),
-        ('proforma', 'Pro-forma'),
-        ('proforma2', 'Pro-forma'),
         ('open', 'Open'),
         ('paid', 'Paid'),
         ('cancel', 'Cancelled')
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 5ceb73ecce1..a7cb1c560b9 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -72,8 +72,7 @@
                 <filter string="This Year" name="thisyear" domain="['|', ('date', '=', False), '&amp;',('date','&lt;=', time.strftime('%%Y-12-31')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Journal invoices with period in current year"/>
                 <separator/>
                 <filter string="To Invoice" domain="[('state','=','draft')]" help = "Draft Invoices"/>
-                <filter string="Pro-forma" domain="['|', ('state','=','proforma'),('state','=','proforma2')]"/>
-                <filter string="Invoiced" name="current" domain="[('state','not in', ('draft','cancel','proforma','proforma2'))]"/>
+                <filter string="Invoiced" name="current" domain="[('state','not in', ('draft','cancel'))]"/>
                 <separator/>
                 <filter string="This Month" name="this_month" domain="[('date', '&gt;=', context_today().strftime('%%Y-%%m-01'))]"/>
                 <filter string="Last Month" name="last_month" domain="['&amp;', ('date', '&gt;=', (context_today() - relativedelta(months=1)).strftime('%%Y-%%m-01')), ('date', '&lt;', context_today().strftime('%%Y-%%m-01'))]"/>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 846a86724b2..d80c2797177 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -25,12 +25,6 @@
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
-
-    <record id="group_proforma_invoices" model="res.groups">
-        <field name="name">Pro-forma Invoices</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_warning_account" model="res.groups">
         <field name="name">A warning can be set on a partner (Account)</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/account/tests/test_account_customer_invoice.py b/addons/account/tests/test_account_customer_invoice.py
index 0c559892644..201d973673c 100644
--- a/addons/account/tests/test_account_customer_invoice.py
+++ b/addons/account/tests/test_account_customer_invoice.py
@@ -70,12 +70,6 @@ class TestAccountCustomerInvoice(AccountTestUsers):
         # I check that Initially customer invoice is in the "Draft" state
         self.assertEquals(self.account_invoice_customer0.state, 'draft')
 
-        # I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
-        self.account_invoice_customer0.action_invoice_proforma2()
-
-        # I check that the invoice state is now "Proforma2"
-        self.assertEquals(self.account_invoice_customer0.state, 'proforma2')
-
         # I check that there is no move attached to the invoice
         self.assertEquals(len(self.account_invoice_customer0.move_id), 0)
 
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 7154cb65c66..ce0079f032e 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -173,7 +173,7 @@
                                     </div>
                                     <div class="col-xs-6">
                                         <span class="pull-right text-right">
-                                            <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'cancel': 'default', 'none': 'danger', 'proforma': 'warning', 'proforma2': 'warning', 'open': 'warning',
+                                            <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'cancel': 'default', 'none': 'danger', 'open': 'warning',
                                             'paid': 'success'}}"/>
                                         </span>
                                     </div>
@@ -217,10 +217,10 @@
             <field name="arch" type="xml">
                 <form string="Vendor Bill">
                 <header>
-                        <button name="action_invoice_open" type="object" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
+                        <button name="action_invoice_open" type="object" states="draft" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
                         <button name="%(action_account_invoice_payment)d" type="action" states="open" string="Register Payment" groups="account.group_account_invoice" class="oe_highlight"/>
                         <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' groups="account.group_account_invoice" attrs="{'invisible': ['|',('type', 'in', ['in_refund','out_refund']),('state','not in',('open','paid'))]}"/>
-                        <button name="action_invoice_cancel" type="object" states="draft,proforma2" string="Cancel Bill" groups="account.group_account_invoice"/>
+                        <button name="action_invoice_cancel" type="object" states="draft" string="Cancel Bill" groups="account.group_account_invoice"/>
                         <button name="action_invoice_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" />
                 </header>
@@ -348,16 +348,14 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                 <header>
-                    <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', 'not in', ('open', 'proforma', 'proforma2'))]}" class="oe_highlight" groups="base.group_user"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
                     <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
-                    <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', 'not in', ('open', 'proforma', 'proforma2'))]}" groups="base.group_user"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
                     <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
                     <button name="%(action_account_invoice_payment)d" type="action" states="open" string="Register Payment" groups="account.group_account_invoice" class="oe_highlight"/>
                     <button name="action_invoice_open" type="object" states="draft" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
-                    <button name="action_invoice_open" type="object" states="proforma2" string="Validate" groups="account.group_account_invoice"/>
-                    <button name="action_invoice_proforma2" type="object" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' groups="account.group_account_invoice" attrs="{'invisible': ['|',('type', '=', 'out_refund'), ('state', 'not in', ('open','proforma2','paid'))]}"/>
-                    <button name="action_invoice_cancel" type="object" states="draft,proforma2,open" string="Cancel Invoice" groups="base.group_no_one"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' groups="account.group_account_invoice" attrs="{'invisible': ['|',('type', '=', 'out_refund'), ('state', 'not in', ('open','paid'))]}"/>
+                    <button name="action_invoice_cancel" type="object" states="draft,open" string="Cancel Invoice" groups="base.group_no_one"/>
                     <button name="action_invoice_draft" states="cancel" string="Reset to Draft" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid"/>
                 </header>
@@ -366,8 +364,7 @@
                 </div>
                 <field name="has_outstanding" invisible="1"/>
                 <sheet string="Invoice">
-                    <label string="Pro Forma Invoice" attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
-                    <label string="Refund" attrs="{'invisible': ['|',('state','in',('draft','proforma','proforma2')), ('type','&lt;&gt;','out_refund')]}"/>
+                    <label string="Refund" attrs="{'invisible': ['|',('state','=','draft'), ('type','&lt;&gt;','out_refund')]}"/>
                     <h1 class="mt0">
                         <label string="Draft Invoice" attrs="{'invisible': ['|',('state','not in',('draft',)), ('type','&lt;&gt;','out_invoice')]}"/>
                         <label string="Draft Refund" attrs="{'invisible': ['|',('state','not in',('draft',)), ('type','&lt;&gt;','out_refund')]}"/>
@@ -511,8 +508,7 @@
                 <search string="Search Invoice">
                     <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]"/>
                     <field name="journal_id" />
-                    <filter name="draft" string="Draft" domain="[('state','in',('draft', 'proforma'))]"/>
-                    <filter name="proforma" string="Proforma" domain="[('state','=','proforma2')]" groups="account.group_proforma_invoices"/>
+                    <filter name="draft" string="Draft" domain="[('state','=','draft')]"/>
                     <filter name="invoices" string="Invoices" domain="['&amp;', ('state','in',['open','paid']),('type','in',('out_invoice','in_invoice'))]"/>
                     <filter name="refunds" string="Refunds" domain="['&amp;', ('state','in',['open','paid']),('type','in',('out_refund','in_refund'))]"/>
                     <separator/>
diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml
index cfc51a41e6c..ff126e0ae67 100644
--- a/addons/account/views/account_journal_dashboard_view.xml
+++ b/addons/account/views/account_journal_dashboard_view.xml
@@ -266,7 +266,7 @@
                         <div class="col-xs-6 o_kanban_primary_right">
                             <div class="row">
                                 <div class="col-xs-6">
-                                    <a type="object" name="open_action" context="{'search_default_draft': '1', 'search_default_proforma': '1'}">
+                                    <a type="object" name="open_action" context="{'search_default_draft': '1'}">
                                         <span t-if="journal_type == 'sale'" title="Invoices to validate"><t t-esc="dashboard.number_draft"/> Invoices to validate</span>
                                         <span t-if="journal_type == 'purchase'" title="Draft bills"><t t-esc="dashboard.number_draft"/> Draft bills</span>
                                     </a>
diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 74011168e11..0f2c9d8bc90 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -15,7 +15,6 @@
 
             <h2>
                 <span t-if="o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')">Invoice</span>
-                <span t-if="o.type == 'out_invoice' and o.state == 'proforma2'">PRO-FORMA</span>
                 <span t-if="o.type == 'out_invoice' and o.state == 'draft'">Draft Invoice</span>
                 <span t-if="o.type == 'out_invoice' and o.state == 'cancel'">Cancelled Invoice</span>
                 <span t-if="o.type == 'out_refund'">Refund</span>
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index 14b4f4000a0..6e65b4316ad 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -145,17 +145,6 @@
                         </div>
                         <h2>Invoicing</h2>
                         <div class="row mt16 o_settings_container" id="invoicing_settings">
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="group_proforma_invoices"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label string="Pro Forma"/>
-                                    <div class="text-muted">
-                                        Get a pro forma status for invoices
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_left_pane">
                                     <field name="group_warning_account"/>
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index c0c2a0a14f5..b2a99d4bb7e 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -50,8 +50,8 @@ class AccountInvoiceRefund(models.TransientModel):
             date = False
             description = False
             for inv in inv_obj.browse(context.get('active_ids')):
-                if inv.state in ['draft', 'proforma2', 'cancel']:
-                    raise UserError(_('Cannot refund draft/proforma/cancelled invoice.'))
+                if inv.state in ['draft', 'cancel']:
+                    raise UserError(_('Cannot refund draft/cancelled invoice.'))
                 if inv.reconciled and mode in ('cancel', 'modify'):
                     raise UserError(_('Cannot refund invoice which is already reconciled, invoice should be unreconciled first. You can only refund this invoice.'))
 
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 025df465a57..7dd8f49a400 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -17,8 +17,8 @@ class AccountInvoiceConfirm(models.TransientModel):
         active_ids = context.get('active_ids', []) or []
 
         for record in self.env['account.invoice'].browse(active_ids):
-            if record.state not in ('draft', 'proforma', 'proforma2'):
-                raise UserError(_("Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state."))
+            if record.state != 'draft':
+                raise UserError(_("Selected invoice(s) cannot be confirmed as they are not in 'Draft' state."))
             record.action_invoice_open()
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/account_cancel/views/account_views.xml b/addons/account_cancel/views/account_views.xml
index 35fdead50df..6eb69bdaeb7 100644
--- a/addons/account_cancel/views/account_views.xml
+++ b/addons/account_cancel/views/account_views.xml
@@ -17,7 +17,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='action_invoice_cancel']" position="replace">
-                    <button name="action_invoice_cancel" type="object" states="draft,proforma2,open" string="Cancel Invoice" groups="account.group_account_invoice"/>
+                    <button name="action_invoice_cancel" type="object" states="draft,open" string="Cancel Invoice" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
         </record>
@@ -28,7 +28,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='action_invoice_cancel']" position="replace">
-                    <button name="action_invoice_cancel" type="object" states="draft,proforma2,open" string="Cancel Invoice" groups="account.group_account_invoice"/>
+                    <button name="action_invoice_cancel" type="object" states="draft,open" string="Cancel Invoice" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/membership/models/membership.py b/addons/membership/models/membership.py
index c9432c08d83..2df513ebddf 100644
--- a/addons/membership/models/membership.py
+++ b/addons/membership/models/membership.py
@@ -68,7 +68,7 @@ class MembershipLine(models.Model):
                 line.state = 'canceled'
                 continue
             istate = fetched[0]
-            if istate in ('draft', 'proforma'):
+            if istate == 'draft':
                 line.state = 'waiting'
             elif istate == 'open':
                 line.state = 'invoiced'
diff --git a/addons/membership/models/partner.py b/addons/membership/models/partner.py
index 9b863bf4cce..919edd63e92 100644
--- a/addons/membership/models/partner.py
+++ b/addons/membership/models/partner.py
@@ -122,7 +122,7 @@ class Partner(models.Model):
                                 s = 1
                             elif mstate == 'cancel' and s != 0 and s != 1:
                                 s = 2
-                            elif  (mstate == 'draft' or mstate == 'proforma') and s != 0 and s != 1:
+                            elif mstate == 'draft' and s != 0 and s != 1:
                                 s = 3
                 if s == 4:
                     for mline in partner.member_lines:
diff --git a/addons/report_intrastat/report/report_intrastat_invoice_template.xml b/addons/report_intrastat/report/report_intrastat_invoice_template.xml
index d177f2ef724..0abe61c42dd 100644
--- a/addons/report_intrastat/report/report_intrastat_invoice_template.xml
+++ b/addons/report_intrastat/report/report_intrastat_invoice_template.xml
@@ -14,7 +14,6 @@
 
             <h2>
                 <span t-if="o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')">Invoice</span>
-                <span t-if="o.type == 'out_invoice' and o.state == 'proforma2'">PRO-FORMA</span>
                 <span t-if="o.type == 'out_invoice' and o.state == 'draft'">Draft Invoice</span>
                 <span t-if="o.type == 'out_invoice' and o.state == 'cancel'">Cancelled Invoice</span>
                 <span t-if="o.type == 'out_refund'">Refund</span>
diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml
index 70513ad9ae8..c48b10da72f 100644
--- a/addons/sale/data/mail_template_data.xml
+++ b/addons/sale/data/mail_template_data.xml
@@ -26,7 +26,12 @@
 % endif
 ,</p>
 <p>
-Here is your ${doc_name} <strong>${object.name}</strong>
+Here is
+% if ctx.get('proforma')
+in attachment, your pro-forma
+% else
+the ${doc_name} <strong>${object.name}</strong>
+% endif
 % if object.origin:
 (with reference: ${object.origin} )
 % endif
@@ -34,8 +39,8 @@ amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.na
 from ${object.company_id.name}.
 </p>
 
+% if is_online and not ctx.get('proforma'):
     <br/><br/>
-% if is_online:
     <center>
         <a href="${access_url}" style="background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;" class="o_default_snippet_text">${access_name}</a>
         <br/><br/><br/>
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 13d1e7a740a..a994d5218dd 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -407,16 +407,16 @@ class SaleOrder(models.Model):
             compose_form_id = ir_model_data.get_object_reference('mail', 'email_compose_message_wizard_form')[1]
         except ValueError:
             compose_form_id = False
-        ctx = dict()
-        ctx.update({
+        ctx = {
             'default_model': 'sale.order',
             'default_res_id': self.ids[0],
             'default_use_template': bool(template_id),
             'default_template_id': template_id,
             'default_composition_mode': 'comment',
             'mark_so_as_sent': True,
-            'custom_layout': "sale.mail_template_data_notification_email_sale_order"
-        })
+            'custom_layout': "sale.mail_template_data_notification_email_sale_order",
+            'proforma': self.env.context.get('proforma', False)
+        }
         return {
             'type': 'ir.actions.act_window',
             'view_type': 'form',
diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py
index 68215f54c66..4bd9099c464 100644
--- a/addons/sale/models/sale_config_settings.py
+++ b/addons/sale/models/sale_config_settings.py
@@ -48,6 +48,8 @@ class SaleConfiguration(models.TransientModel):
         "Show total",
         implied_group='sale.group_show_price_total',
         group='base.group_portal,base.group_user,base.group_public')
+    group_proforma_sales = fields.Boolean(string="Pro-Forma", implied_group='sale.group_proforma_sales',
+        help="Allows you to send pro-forma.")
     sale_show_tax = fields.Selection([
         ('subtotal', 'Tax-Included Prices'),
         ('total', 'Tax-Excluded Prices')], "Tax Display",
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 6e510e29af4..cb63bf50ab8 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -122,3 +122,17 @@ class SaleReport(models.Model):
             FROM ( %s )
             %s
             )""" % (self._table, self._select(), self._from(), self._group_by()))
+
+class SaleOrderReportProforma(models.AbstractModel):
+    _name = 'report.sale.report_saleproforma'
+
+    @api.multi
+    def render_html(self, docids, data=None):
+        docs = self.env['sale.order'].browse(docids)
+        docargs = {
+            'doc_ids': docs.ids,
+            'doc_model': 'sale.order',
+            'docs': docs,
+            'proforma': True
+        }
+        return self.env['report'].render('sale.report_saleorder', docargs)
diff --git a/addons/sale/report/sale_report.xml b/addons/sale/report/sale_report.xml
index e0bad531aea..3e4996dffe2 100644
--- a/addons/sale/report/sale_report.xml
+++ b/addons/sale/report/sale_report.xml
@@ -12,5 +12,17 @@
         <record id="report_sale_order" model="ir.actions.report.xml">
             <field name="print_report_name">(object.state in ('draft', 'sent') and 'Quotation'+'-'+(object.name) or 'Order'+'-'+(object.name))</field>
         </record>
+
+         <report
+            string="Pro-Forma"
+            id="report_proforma_quotation"
+            model="sale.order"
+            report_type="qweb-pdf"
+            name="sale.report_saleproforma"
+            file="sale.report_saleorder"
+        />
+        <record id="report_proforma_quotation" model="ir.actions.report.xml">
+            <field name="print_report_name">'Pro-Forma'+'-'+(object.name)</field>
+        </record>
     </data>
 </odoo>
diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml
index ee934c32619..286443cba6f 100644
--- a/addons/sale/report/sale_report_templates.xml
+++ b/addons/sale/report/sale_report_templates.xml
@@ -30,8 +30,13 @@
             </div>
 
             <h2>
-                <span t-if="doc.state not in ['draft','sent']">Order # </span>
-                <span t-if="doc.state in ['draft','sent']">Quotation # </span>
+                <t t-if="not proforma">
+                    <span t-if="doc.state not in ['draft','sent']">Order # </span>
+                    <span t-if="doc.state in ['draft','sent']">Quotation # </span>
+                </t>
+                <t t-if="proforma">
+                    <span>Pro-Forma # </span>
+                </t>
                 <span t-field="doc.name"/>
             </h2>
 
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index c5c1bd487ba..d95581013b4 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -46,6 +46,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_proforma_sales" model="res.groups">
+        <field name="name">Pro-forma Invoices</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting for Sales</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index c33bd723ae1..565b8d4dffe 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -246,6 +246,17 @@
                             </div>
                         </div>
                     </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box">
+                        <div class="o_setting_left_pane">
+                            <field name="group_proforma_sales"/>
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label for="group_proforma_sales"/>
+                            <div class="text-muted">
+                                Allows you to send Pro-Forma to your customers
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 <h2>Invoicing</h2>
                 <div class="row mt16 o_settings_container">
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 3bec9e7bdb4..48573230b2b 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -154,9 +154,11 @@
                         type="action" context="{'default_advance_payment_method': 'percentage'}"
                         attrs="{'invisible': ['|',('invoice_status', '!=', 'no'), ('state', '!=', 'sale')]}"/>
                     <button name="action_quotation_send" string="Send by Email" type="object" states="draft" class="btn-primary"/>
+                    <button name="action_quotation_send" type="object" string="Send PRO-FORMA" groups="sale.group_proforma_sales" class="btn-primary" attrs="{'invisible': ['|', ('state', 'in', ['sent', 'sale']), ('invoice_count','&gt;=',1)]}" context="{'proforma': True}"/>
                     <button name="print_quotation" string="Print" type="object" states="draft" class="btn-primary"/>
                     <button name="action_confirm" states="sent" string="Confirm Sale" class="btn-primary o_sale_confirm" type="object" />
                     <button name="action_confirm" states="draft" string="Confirm Sale" class="o_sale_confirm" type="object" />
+                    <button name="action_quotation_send" type="object" string="Send PRO-FORMA" groups="sale.group_proforma_sales" attrs="{'invisible': ['|', ('state', '=', 'draft'), ('invoice_count','&gt;=',1)]}" context="{'proforma': True}"/>
                     <button name="print_quotation" string="Print" type="object" states="sent,sale"/>
                     <button name="action_quotation_send" string="Send by Email" type="object" states="sent,sale"/>
                     <button name="action_cancel" states="draft,sent,sale" type="object" string="Cancel"/>