diff --git a/account_spread_cost_revenue/i18n/account_spread_cost_revenue.pot b/account_spread_cost_revenue/i18n/account_spread_cost_revenue.pot
index 90a1fed4..2800ad7f 100644
--- a/account_spread_cost_revenue/i18n/account_spread_cost_revenue.pot
+++ b/account_spread_cost_revenue/i18n/account_spread_cost_revenue.pot
@@ -30,21 +30,41 @@ msgstr ""
 #. module: account_spread_cost_revenue
 #: model_terms:ir.ui.view,arch_db:account_spread_cost_revenue.view_account_spread
 msgid "<span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('out_invoice','in_refund'))]}\">\n"
-"                                  The Balance Sheet account used for the spreading.<br/>This account is the counterpart of the account in the invoice line.\n"
-"                            </span>\n"
-"                            <span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('in_invoice','out_refund'))]}\">\n"
-"                                  The Expense account in the vendor bill line.<br/>Usually the same account of the vendor bill line.\n"
-"                            </span>"
+"                                      The Balance Sheet account used for the spreading.<br/>This account is the counterpart of the account in the invoice line.\n"
+"                                </span>\n"
+"                                <span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('in_invoice','out_refund'))]}\">\n"
+"                                      The Expense account in the vendor bill line.<br/>Usually the same account of the vendor bill line.\n"
+"                                </span>"
 msgstr ""
 
 #. module: account_spread_cost_revenue
 #: model_terms:ir.ui.view,arch_db:account_spread_cost_revenue.view_account_spread
 msgid "<span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('out_invoice','in_refund'))]}\">\n"
-"                                  The Revenue account in the invoice line.<br/>Usually the same account of the invoice line.\n"
-"                            </span>\n"
-"                            <span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('in_invoice','out_refund'))]}\">\n"
-"                                  The Balance Sheet account used for the spreading.<br/>This account is the counterpart of the account in the vendor bill line.\n"
-"                            </span>"
+"                                      The Balance Sheet account.<br/>This is the account in the invoice line.\n"
+"                                </span>\n"
+"                                <span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('in_invoice','out_refund'))]}\">\n"
+"                                      The Expense account used for the spreading.<br/>This account is the counterpart of the account of the vendor bill line.\n"
+"                                </span>"
+msgstr ""
+
+#. module: account_spread_cost_revenue
+#: model_terms:ir.ui.view,arch_db:account_spread_cost_revenue.view_account_spread
+msgid "<span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('out_invoice','in_refund'))]}\">\n"
+"                                      The Revenue account in the invoice line.<br/>Usually the same account of the invoice line.\n"
+"                                </span>\n"
+"                                <span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('in_invoice','out_refund'))]}\">\n"
+"                                      The Balance Sheet account used for the spreading.<br/>This account is the counterpart of the account in the vendor bill line.\n"
+"                                </span>"
+msgstr ""
+
+#. module: account_spread_cost_revenue
+#: model_terms:ir.ui.view,arch_db:account_spread_cost_revenue.view_account_spread
+msgid "<span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('out_invoice','in_refund'))]}\">\n"
+"                                      The Revenue account used for the spreading.<br/>This account is the counterpart of the account of the invoice line.\n"
+"                                </span>\n"
+"                                <span class=\"help-block\" colspan=\"2\" attrs=\"{'invisible':[('invoice_type','not in',('in_invoice','out_refund'))]}\">\n"
+"                                      The Balance Sheet account.<br/>This is the account in the vendor bill line.\n"
+"                                </span>"
 msgstr ""
 
 #. module: account_spread_cost_revenue
@@ -140,19 +160,19 @@ msgid "Cancel"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:464
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:467
 #, python-format
 msgid "Cannot delete spread(s) that are linked to an invoice line."
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:469
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:472
 #, python-format
 msgid "Cannot delete spread(s): there are posted Journal Entries."
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:436
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:439
 #, python-format
 msgid "Cannot unlink invoice lines if the invoice is validated"
 msgstr ""
@@ -359,6 +379,16 @@ msgstr ""
 msgid "Expense account"
 msgstr ""
 
+#. module: account_spread_cost_revenue
+#: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread_template__exp_rev_account_id
+msgid "Expense/Revenue Account"
+msgstr ""
+
+#. module: account_spread_cost_revenue
+#: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread_invoice_line_link_wizard__exp_rev_account_id
+msgid "Expense/revenue account"
+msgstr ""
+
 #. module: account_spread_cost_revenue
 #: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread__message_follower_ids
 msgid "Followers"
@@ -398,7 +428,7 @@ msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:450
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:453
 #: model:ir.model,name:account_spread_cost_revenue.model_account_invoice
 #: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread__invoice_id
 #, python-format
@@ -427,6 +457,11 @@ msgstr ""
 msgid "Invoice Type"
 msgstr ""
 
+#. module: account_spread_cost_revenue
+#: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread_template__use_invoice_line_account
+msgid "Invoice account as spread account"
+msgstr ""
+
 #. module: account_spread_cost_revenue
 #: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread__invoice_line_id
 msgid "Invoice line"
@@ -536,7 +571,7 @@ msgid "Name"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py:141
+#: code:addons/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py:157
 #, python-format
 msgid "New Spread Board"
 msgstr ""
@@ -579,6 +614,12 @@ msgstr ""
 msgid "Number of unread messages"
 msgstr ""
 
+#. module: account_spread_cost_revenue
+#: model:ir.model.fields,help:account_spread_cost_revenue.field_account_spread_invoice_line_link_wizard__exp_rev_account_id
+#: model:ir.model.fields,help:account_spread_cost_revenue.field_account_spread_template__exp_rev_account_id
+msgid "Optional account to overwrite the existing expense/revenue account"
+msgstr ""
+
 #. module: account_spread_cost_revenue
 #: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread__period_type
 #: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread_template__period_type
@@ -633,7 +674,7 @@ msgid "Revenue account"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:455
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:458
 #, python-format
 msgid "Spread"
 msgstr ""
@@ -673,8 +714,8 @@ msgstr ""
 
 #. module: account_spread_cost_revenue
 #: code:addons/account_spread_cost_revenue/models/account_invoice_line.py:40
-#: code:addons/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py:120
-#: code:addons/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py:190
+#: code:addons/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py:134
+#: code:addons/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py:213
 #, python-format
 msgid "Spread Details"
 msgstr ""
@@ -719,7 +760,7 @@ msgid "Spread lines"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:375
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:378
 #, python-format
 msgid "Spread table '%s' created."
 msgstr ""
@@ -738,25 +779,25 @@ msgid "Supplier"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:261
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:264
 #, python-format
 msgid "The Invoice Type does not correspond to the Invoice"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:269
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:272
 #, python-format
 msgid "The Journal is not consistent with the account moves."
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:282
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:285
 #, python-format
 msgid "The Spread Template (Purchases) is not compatible with selected invoice type"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:277
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:280
 #, python-format
 msgid "The Spread Template (Sales) is not compatible with selected invoice type"
 msgstr ""
@@ -803,13 +844,13 @@ msgid "Unlinked"
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:456
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:459
 #, python-format
 msgid "Unlinked '%s' (invoice line %s)."
 msgstr ""
 
 #. module: account_spread_cost_revenue
-#: code:addons/account_spread_cost_revenue/models/account_spread.py:451
+#: code:addons/account_spread_cost_revenue/models/account_spread.py:454
 #, python-format
 msgid "Unlinked invoice line '%s' (view %s)."
 msgstr ""
@@ -834,6 +875,19 @@ msgstr ""
 msgid "Unspread Amount"
 msgstr ""
 
+#. module: account_spread_cost_revenue
+#: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread__use_invoice_line_account
+#: model:ir.model.fields,field_description:account_spread_cost_revenue.field_account_spread_invoice_line_link_wizard__use_invoice_line_account
+msgid "Use invoice line's account"
+msgstr ""
+
+#. module: account_spread_cost_revenue
+#: model:ir.model.fields,help:account_spread_cost_revenue.field_account_spread_invoice_line_link_wizard__use_invoice_line_account
+#: model:ir.model.fields,help:account_spread_cost_revenue.field_account_spread_template__use_invoice_line_account
+msgid "Use invoice line's account as Balance sheet / spread account.\n"
+"In this case, user need to select expense/revenue account too."
+msgstr ""
+
 #. module: account_spread_cost_revenue
 #: selection:account.spread,invoice_type:0
 #: selection:account.spread.invoice.line.link.wizard,invoice_type:0