diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index b07087219b3..fc717cc60c2 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -33,6 +33,9 @@ class SaleAdvancePaymentInv(models.TransientModel):
         default=lambda self: self.env['ir.values'].get_default('sale.config.settings', 'deposit_product_id_setting'))
     count = fields.Integer(default=_count, string='# of Orders')
     amount = fields.Float('Deposit Amount', digits=dp.get_precision('Account'), help="The amount to be invoiced in advance, taxes excluded.")
+    deposit_account_id = fields.Many2one("account.account", string="Income Account", domain=[('deprecated', '=', False)],\
+        help="Account used for deposits")
+    deposit_taxes_id = fields.Many2many("account.tax", string="Customer Taxes", help="Taxes used for deposits")
 
     @api.onchange('advance_payment_method')
     def onchange_advance_payment_method(self):
@@ -103,6 +106,12 @@ class SaleAdvancePaymentInv(models.TransientModel):
         elif self.advance_payment_method == 'all':
             sale_orders.action_invoice_create(final=True)
         else:
+            # Create deposit product if necessary
+            if not self.product_id:
+                vals = self._prepare_deposit_product()
+                self.product_id = self.env['product.product'].create(vals)
+                self.env['ir.values'].set_default('sale.config.settings', 'deposit_product_id_setting', self.product_id.id)
+
             sale_line_obj = self.env['sale.order.line']
             for order in sale_orders:
                 if self.advance_payment_method == 'percentage':
@@ -121,9 +130,18 @@ class SaleAdvancePaymentInv(models.TransientModel):
                     'discount': 0.0,
                     'product_uom': self.product_id.uom_id.id,
                     'product_id': self.product_id.id,
-                    'tax_id': self.product_id.taxes_id,
+                    'tax_id': [(6, 0, self.product_id.taxes_id.ids)],
                 })
                 self._create_invoice(order, so_line, amount)
         if self._context.get('open_invoices', False):
             return sale_orders.action_view_invoice()
         return {'type': 'ir.actions.act_window_close'}
+
+    def _prepare_deposit_product(self):
+        return {
+            'name': 'Deposit',
+            'type': 'service',
+            'invoice_policy': 'order',
+            'property_account_income_id': self.deposit_account_id.id,
+            'taxes_id': [(6, 0, self.deposit_taxes_id.ids)],
+        }
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index e4d70cd8fb6..1425990d52c 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -16,7 +16,7 @@
                             attrs="{'invisible': [('count','>',1)]}"/>
                         <field name="product_id"
                             context="{'search_default_services': 1, 'default_type': 'service', 'default_invoice_policy': 'order'}" class="oe_inline"
-                            attrs="{'invisible': [('advance_payment_method','not in', ('fixed','percentage'))]}"/>
+                            attrs="{'invisible': 1}"/>
                         <label for="amount" attrs="{'invisible': [('advance_payment_method', 'not in', ('fixed','percentage'))]}"/>
                         <div attrs="{'invisible': [('advance_payment_method', 'not in', ('fixed','percentage'))]}">
                             <field name="amount"
@@ -24,6 +24,10 @@
                             <label string="%%"
                                 attrs="{'invisible': [('advance_payment_method', '!=', 'percentage')]}" class="oe_inline"/>
                         </div>
+                        <field name="deposit_account_id" class="oe_inline"
+                            attrs="{'invisible': ['|', ('advance_payment_method', 'not in', ('fixed', 'percentage')), ('product_id', '!=', False)]}"/>
+                        <field name="deposit_taxes_id" class="oe_inline" widget="many2many_tags"
+                            attrs="{'invisible': ['|', ('advance_payment_method', 'not in', ('fixed', 'percentage')), ('product_id', '!=', False)]}"/>
                     </group>
                     <footer>
                         <button name="create_invoices" string="Create and View Invoices" type="object"