diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7473cadc4eb..2dd6bd4cc0e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -215,19 +215,6 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Invoice">
-<<<<<<< HEAD:server/bin/addons/account/account_invoice_view.xml
-				<notebook>
-					<page string="Invoice">
-						<field name="journal_id" select="2"/>
-						<field name="type" select="2" readonly="1"/>
-						<field name="partner_id" on_change="onchange_partner_id(type,partner_id)" select="1"/>
-						<field name="address_invoice_id" domain="[('partner_id','=',partner_id)]"/>
-						<field name="account_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" />
-						<field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" />
-						<field name="name" select="2"/>
-						<field name="number" select="1"/>
-						<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
-=======
 					<notebook>
 						<page string="Invoice">
 							<field name="journal_id" select="2"/>
@@ -239,42 +226,7 @@
 							<field name="name" select="2"/>
 							<field name="number" select="1"/>
 							<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
->>>>>>> 88bb23c... Re-add PRO-FORMA button on customer invoice and add invoice state on report:server/bin/addons/account/account_invoice_view.xml
-
-<<<<<<< HEAD:server/bin/addons/account/account_invoice_view.xml
-						<field name="invoice_line" nolabel="1" widget="one2many_list" colspan="4"/>
-=======
 							<field name="invoice_line" nolabel="1" widget="one2many_list" colspan="4"/>
->>>>>>> 88bb23c... Re-add PRO-FORMA button on customer invoice and add invoice state on report:server/bin/addons/account/account_invoice_view.xml
-
-<<<<<<< HEAD:server/bin/addons/account/account_invoice_view.xml
-						<group col="1" colspan="2">
-							<field name="tax_line" nolabel="1">
-								<tree string="Taxes" editable="bottom">
-									<field name="name"/>
-									<field name="base" on_change="base_change(base)" readonly="1"/>
-									<field name="amount" on_change="amount_change(amount)"/>
-
-									<field name="base_amount" invisible="True"/>
-									<field name="tax_amount" invisible="True"/>
-								</tree>
-							</field>
-						</group>
-						<group col="4" colspan="2">
-							<label colspan="2"/>
-							<field name="amount_untaxed"/>
-							<button name="button_reset_taxes" string="Reset taxes" states="draft" type="object" colspan="2"/>
-							<field name="amount_tax"/>
-							<button name="button_compute" string="Compute" states="draft" type="object" colspan="2"/>
-							<field name="amount_total"/>
-							<field name="reconciled"/>
-							<field name="state" select="2"/>
-							<group col="4" colspan="4" expand="1">
-								<button name="invoice_proforma" states="draft" string="PRO-FORMA"/>
-								<button name="invoice_open" states="draft,proforma" string="Validate"/>
-								<button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
-								<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
-=======
 							<group col="1" colspan="2">
 								<field name="tax_line" nolabel="1">
 									<tree string="Taxes" editable="bottom">
@@ -301,7 +253,6 @@
 									<button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
 									<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
 								</group>
->>>>>>> 88bb23c... Re-add PRO-FORMA button on customer invoice and add invoice state on report:server/bin/addons/account/account_invoice_view.xml
 							</group>
 						</group>
 					</page>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index f83b53f20b5..dbfc98eb254 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -1,7 +1,3 @@
 <?xml version="1.0"?>
-<<<<<<< HEAD:server/bin/addons/account/report/invoice.rml
-<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="34.0" y1="28.0" width="527" height="786"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau2"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau6"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/><blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/><blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/></blockTableStyle><blockTableStyle id="Tableau7"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau8"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Tableau4"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/></blockTableStyle><blockTableStyle id="Tableau5"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P2" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P3" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P5" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P6" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P7" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P8" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P10" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P11" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P12" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P13" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/><paraStyle name="P14" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER"/><paraStyle name="P15" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/><paraStyle name="P16" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P17" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/><paraStyle name="P19" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P21" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/></stylesheet><images/><story><para style="P1">[[ repeatIn(objects,'o') ]]</para><para style="P1">[[ setLang(o.partner_id.lang) ]]</para><blockTable colWidths="295.0,232.0" style="Tableau2"><tr><td><para style="P2"><font color="white"> </font></para></td><td><para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para><para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para><para style="Standard">[[ o.address_invoice_id.street ]]</para><para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para><para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para><para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para><para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para><para style="Standard"><font color="white"> </font></para><para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para><para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para><para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para></td></tr></blockTable><para style="P13"><font color="white"> </font></para><para style="P15"><font face="Times-Roman">Invoice [[ (o.type=='out_invoice' or removeParentNode('font')) and '' ]]</font><font face="Times-Roman">Refund [[ (o.type=='out_refund' or removeParentNode('font')) and '' ]]</font><font face="Times-Roman">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('font')) and '' ]]</font><font face="Times-Roman">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('font')) and '' ]]</font><font face="Times-Roman">[[ o.number ]]</font></para><para style="P14"><font color="white"> </font></para><para style="P16"><font face="Times-Roman">Document</font><font face="Times-Roman">:</font><font face="Times-Roman">[[o.name]]</font></para><para style="P16"><font face="Times-Roman">Invoice Date: </font><font face="Times-Roman">[[o.date_invoice]]</font></para><para style="P17"><font face="Times-Roman">Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para><para style="Standard"><font color="white"> </font></para><blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6"><tr><td><para style="P3">Description</para></td><td><para style="P4">Taxes</para></td><td><para style="P4">Quantity</para></td><td><para style="P4">Unit Price</para></td><td><para style="P4">Disc. (%)</para></td><td><para style="P4">Price</para></td></tr></blockTable><section><para style="P19">[[repeatIn(o.invoice_line,'l') ]]</para><blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau7"><tr><td><para style="Table Contents">[[ l.name ]]</para></td><td><para style="P6">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]</para></td><td><para style="P8">[[ '%.2f' % l.quantity ]] [[l.uos_id and l.uos_id.name or '' ]]</para></td><td><para style="P8">[[ '%.2f' % l.price_unit ]]</para></td><td><para style="P8">[[ l.discount and '%.2f' % (l.discount) or '' ]] </para></td><td><para style="P8">[[ '%.2f' %l.price_subtotal ]] [[o.currency_id.code ]]</para></td></tr></blockTable><blockTable colWidths="28.0,499.0" style="Tableau8"><tr><td><para style="P20">[[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]]</para></td><td><para style="P9">[[ note or removeParentNode('table') ]]</para></td></tr></blockTable></section><para style="Standard"><font color="white"> </font></para><blockTable colWidths="215.0,313.0" style="Tableau3"><tr><td><blockTable colWidths="81.0,73.0,60.0" style="Tableau4"><tr><td><para style="P10">Tax</para></td><td><para style="P8">Base</para></td><td><para style="P8">Amount</para></td></tr><tr><td><para style="P5"><font face="Times-Roman" size="6.0">[[ repeatIn(o.tax_line,'t') ]]</font>[[ t.name ]]</para></td><td><para style="P11">[[ '%.2f' % t.base ]]</para></td><td><para style="P11">[[ '%.2f' % t.amount]]</para></td></tr></blockTable></td><td><blockTable colWidths="214.0,95.0" style="Tableau5"><tr><td><para style="P7">Total (excl. taxes):</para></td><td><para style="P11">[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</para></td></tr><tr><td><para style="P7">Taxes:</para></td><td><para style="P11">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td></tr><tr><td><para style="P12">Total <font face="Times-Roman">(incl. taxes):</font></para></td><td><para style="P21">[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</para></td></tr></blockTable><para style="Table Contents"><font color="white"> </font></para></td></tr></blockTable><para style="P18">[[ format(o.comment or '') ]]</para><para style="P18"><font color="white"> </font></para><para style="P18">[[ format((o.payment_term and o.payment_term.note) or '') ]]</para></story></document>
-=======
 <document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="34.0" y1="28.0" width="527" height="786"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau2"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau6"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/><blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/><blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/></blockTableStyle><blockTableStyle id="Tableau7"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau8"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Tableau4"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/></blockTableStyle><blockTableStyle id="Tableau5"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P2" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P3" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P5" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P6" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P7" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P8" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P10" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P11" fontName="Times-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P12" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P13" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P14" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="LEFT"/><paraStyle name="P15" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER"/><paraStyle name="P16" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/><paraStyle name="P17" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/><paraStyle name="P20" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P22" fontName="Times-Roman" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P23" fontName="Times-Roman" fontSize="20.0" leading="25" alignment="LEFT"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/></stylesheet><images/><story><para style="P1">[[ repeatIn(objects,'o') ]]</para><para style="P1">[[ setLang(o.partner_id.lang) ]]</para><blockTable colWidths="295.0,232.0" style="Tableau2"><tr><td><para style="P2"><font color="white"> </font></para></td><td><para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para><para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para><para style="Standard">[[ o.address_invoice_id.street ]]</para><para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para><para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para><para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para><para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para><para style="Standard"><font color="white"> </font></para><para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para><para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para><para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para></td></tr></blockTable><para style="P14"><font color="white"> </font></para><para style="P16"><font face="Times-Roman">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</font></para><para style="P16"><font face="Times-Roman">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</font></para><para style="P16"><font face="Times-Roman">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</font></para><para style="P16"><font face="Times-Roman">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</font></para><para style="P16"><font face="Times-Roman">Refund [[ (o.type=='out_refund' or removeParentNode('font')) and '' ]] [[ o.number ]]</font></para><para style="P16"><font face="Times-Roman">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</font></para><para style="P16"><font face="Times-Roman">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font face="Times-Roman">[[ o.number ]]</font></para><para style="P15"><font color="white"> </font></para><para style="P17"><font face="Times-Roman">Document</font><font face="Times-Roman">:</font><font face="Times-Roman">[[o.name]]</font></para><para style="P17"><font face="Times-Roman">Invoice Date: </font><font face="Times-Roman">[[o.date_invoice]]</font></para><para style="P18"><font face="Times-Roman">Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para><para style="Standard"><font color="white"> </font></para><blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau6"><tr><td><para style="P3">Description</para></td><td><para style="P4">Taxes</para></td><td><para style="P4">Quantity</para></td><td><para style="P4">Unit Price</para></td><td><para style="P4">Disc. (%)</para></td><td><para style="P4">Price</para></td></tr></blockTable><section><para style="P20">[[repeatIn(o.invoice_line,'l') ]]</para><blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Tableau7"><tr><td><para style="Table Contents">[[ l.name ]]</para></td><td><para style="P6">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]</para></td><td><para style="P8">[[ '%.2f' % l.quantity ]] [[l.uos_id and l.uos_id.name or '' ]]</para></td><td><para style="P8">[[ '%.2f' % l.price_unit ]]</para></td><td><para style="P8">[[ l.discount and '%.2f' % (l.discount) or '' ]] </para></td><td><para style="P8">[[ '%.2f' %l.price_subtotal ]] [[o.currency_id.code ]]</para></td></tr></blockTable><blockTable colWidths="28.0,499.0" style="Tableau8"><tr><td><para style="P21">[[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]]</para></td><td><para style="P9">[[ note or removeParentNode('table') ]]</para></td></tr></blockTable></section><para style="Standard"><font color="white"> </font></para><blockTable colWidths="215.0,313.0" style="Tableau3"><tr><td><blockTable colWidths="81.0,73.0,60.0" style="Tableau4"><tr><td><para style="P10">Tax</para></td><td><para style="P8">Base</para></td><td><para style="P8">Amount</para></td></tr><tr><td><para style="P5"><font face="Times-Roman">[[ repeatIn(o.tax_line,'t') ]]</font> [[ t.name ]]</para></td><td><para style="P11">[[ '%.2f' % t.base ]]</para></td><td><para style="P11">[[ '%.2f' % t.amount]]</para></td></tr></blockTable></td><td><blockTable colWidths="214.0,95.0" style="Tableau5"><tr><td><para style="P7">Total (excl. taxes):</para></td><td><para style="P12">[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</para></td></tr><tr><td><para style="P7">Taxes:</para></td><td><para style="P12">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td></tr><tr><td><para style="P13">Total <font face="Times-Roman">(incl. taxes):</font></para></td><td><para style="P22">[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</para></td></tr></blockTable><para style="Table Contents"><font color="white"> </font></para></td></tr></blockTable><para style="P19">[[ format(o.comment or '') ]]</para><para style="P19"><font color="white"> </font></para><para style="P19">[[ format((o.payment_term and o.payment_term.note) or '') ]]</para></story></document>
->>>>>>> 88bb23c... Re-add PRO-FORMA button on customer invoice and add invoice state on report:server/bin/addons/account/report/invoice.rml