From f2923028d4ed805bcb985f322ed7bbbff9462a0c Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Mon, 7 Sep 2015 14:28:45 +0200
Subject: [PATCH] [IMP] sale: Make advance_payment_method field understandable
 for the ordinary mortals

---
 addons/sale/wizard/sale_make_invoice_advance.py  | 4 ++--
 addons/sale/wizard/sale_make_invoice_advance.xml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index d79b0d4f3aa..b1f4b9d920a 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -31,8 +31,8 @@ class SaleAdvancePaymentInv(models.TransientModel):
             return False
 
     advance_payment_method = fields.Selection([
-        ('delivered', 'Ready to invoice'),
-        ('all', 'Ready to invoice (with refunds)'),
+        ('all', 'Invoiceable lines'),
+        ('delivered', 'Invoiceable lines (without refunds)'),
         ('percentage', 'Deposit (percentage)'),
         ('fixed', 'Deposit (fixed amount)')
         ], string='What do you want to invoice?', default=_get_advance_payment_method, required=True)
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index cbfa1fa5cbe..4bc87920a28 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -25,6 +25,11 @@
                                 attrs="{'invisible': [('advance_payment_method', '!=', 'percentage')]}" class="oe_inline"/>
                         </div>
                     </group>
+                    <div attrs="{'invisible': [('advance_payment_method', '!=', 'delivered')]}">
+                        <span class="oe_grey">
+                        Note that if you select 'Invoiceable lines (without refunds)', you won't be able to create an invoice with a negative total amount.
+                        </span>
+                    </div>
                     <footer>
                         <button name="create_invoices" string="Create and View Invoices" type="object"
                             context="{'open_invoices': True}" class="btn-primary"/>