Skip to content
Snippets Groups Projects
Commit f0fcb5b2 authored by hupo-odoo's avatar hupo-odoo
Browse files

[IMP] web: invoice layout preview 

When invoicing the first time to a customer, the user can choose a style layout for the invoice.
The 'Striped' laoyout is a little bit different when we configure it and preview the pdf than when using it in an actual invoice.
This commit make the layout preview more accurate in relation to the real invoices.

Comment that led to the task : https://www.odoo.com/web#id=3232301&menu_id=4720&cids=1&action=333&active_id=809&model=project.task&view_type=form



closes odoo/odoo#115979

Task: 3236310
Signed-off-by: default avatarWilliam André (wan) <wan@odoo.com>
parent ba3b6233
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
addons/web/views/report_templates.xml
+ 30
− 32
View file @ f0fcb5b2
......@@ -119,43 +119,41 @@
<template id="report_invoice_wizard_preview">
<t t-call="web.html_preview_container">
<t t-call="web.external_layout">
<div class="pt-5">
<div class="address row">
<div name="address" class="col-5" style="margin-left: auto">
<address>
<address class="mb-0" itemscope="itemscope"
itemtype="http://schema.org/Organization">
<div>
<span itemprop="name">Deco Addict</span>
<div class="address row">
<div name="address" class="col-5" style="margin-left: auto">
<address>
<address class="mb-0" itemscope="itemscope"
itemtype="http://schema.org/Organization">
<div>
<span itemprop="name">Deco Addict</span>
</div>
<div itemprop="address" itemscope="itemscope"
itemtype="http://schema.org/PostalAddress">
<div class="d-flex align-items-baseline">
<span class="w-100 o_force_ltr" itemprop="streetAddress">77 Santa Barbara
Rd<br/>Pleasant Hill CA 94523<br/>United States</span>
</div>
<div itemprop="address" itemscope="itemscope"
itemtype="http://schema.org/PostalAddress">
<div class="d-flex align-items-baseline">
<span class="w-100 o_force_ltr" itemprop="streetAddress">77 Santa Barbara
Rd<br/>Pleasant Hill CA 94523<br/>United States</span>
</div>
</div>
</address>
</div>
</address>
</div>
</address>
</div>
</div>
<div class="page">
<div class="page mt-5">
<h2>
<span>Invoice</span>
<span>INV/2020/07/0003</span>
<span>INV/2023/00003</span>
</h2>
<div id="informations" class="row mt32 mb32">
<div class="col-auto mw-100 mb-2" name="invoice_date">
<div id="informations" class="row mt-4 mb-4">
<div class="col-auto col-3 mw-100 mb-2" name="invoice_date">
<strong>Invoice Date:</strong>
<p class="m-0">07/08/2020</p>
</div>
<div class="col-auto mw-100 mb-2" name="due_date">
<div class="col-auto col-3 mw-100 mb-2" name="due_date">
<strong>Due Date:</strong>
<p class="m-0">08/07/2020</p>
</div>
</div>
<table class="table table-sm o_main_table" name="invoice_line_table">
<table class="table table-sm o_main_table table-borderless" name="invoice_line_table">
<thead>
<tr>
<th name="th_description" class="text-start"><span>Description</span></th>
......@@ -172,13 +170,13 @@
<td name="account_invoice_line_name"><span>[FURN_8999] Three-Seat Sofa<br/>
Three Seater Sofa with Lounger in Steel Grey Colour</span></td>
<td class="text-end">
<span>5.000</span>
<span>5.00</span>
</td>
<td class="text-end d-md-table-cell">
<span class="text-nowrap">1,500.00</span>
</td>
<td class="text-start d-md-table-cell">
<span id="line_tax_ids">15.00%</span>
<span id="line_tax_ids">Tax 15%</span>
</td>
<td class="text-end o_price_total">
<span class="text-nowrap">$ <span class="oe_currency_value">7,500.00</span></span>
......@@ -188,13 +186,13 @@
<td name="account_invoice_line_name"><span>[FURN_8220] Four Person Desk<br/>
Four person modern office workstation</span></td>
<td class="text-end">
<span>5.000</span>
<span>5.00</span>
</td>
<td class="text-end d-md-table-cell">
<span class="text-nowrap">2,350.00</span>
</td>
<td class="text-start d-md-table-cell">
<span id="line_tax_ids">15.00%</span>
<span id="line_tax_ids">Tax 15%</span>
</td>
<td class="text-end o_price_total">
<span class="text-nowrap">$ <span class="oe_currency_value">11,750.00</span></span>
......@@ -204,10 +202,10 @@
</table>
<div class="clearfix">
<div id="total" class="row">
<div class="col-7 ms-auto">
<table class="table table-sm" style="page-break-inside: avoid; position:relative;">
<div class="col-6 ms-auto">
<table class="table table-sm table-borderless" style="page-break-inside: avoid; position:relative;">
<tbody><tr class="border-black o_subtotal" style="">
<td><strong>Subtotal</strong></td>
<td><strong>Untaxed Amount</strong></td>
<td class="text-end">
<span>$ <span class="oe_currency_value">19,250.00</span></span>
</td>
......@@ -229,9 +227,9 @@
</div>
</div>
</div>
<p>
<p class="mt-4">
Please use the following communication for your payment : <b><span>
INV/2020/07/0003</span></b>
INV/2023/00003</span></b>
</p>
<p name="payment_term">
<span>Payment terms: 30 Days</span>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment