Skip to content
Extraits de code Groupes Projets
Valider d9994fc0 rédigé par Benjamin's avatar Benjamin
Parcourir les fichiers

modification alignement prix

parent 1190bc52
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -60,6 +60,9 @@ Modification du Header ...@@ -60,6 +60,9 @@ Modification du Header
.block-picto { .block-picto {
text-align: center; font-size: 11px; border-right: 1px solid #ccc; text-align: center; font-size: 11px; border-right: 1px solid #ccc;
} }
.block-picto:last-child {
text-align: center; font-size: 11px; border-right: none;
}
.picto { .picto {
width: 30px; border-radius: 50%; display: inline-block; width: 30px; border-radius: 50%; display: inline-block;
} }
...@@ -75,7 +78,7 @@ Modification du Header ...@@ -75,7 +78,7 @@ Modification du Header
<div class="col-xs-4"> <div class="col-xs-4">
<img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo" style="max-height: 60px;width:auto;"/> <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo" style="max-height: 60px;width:auto;"/>
</div> </div>
<div class="col-xs-8"> <div class="col-xs-8" style="margin-right: -15px;">
<div class="col-xs-4 block-picto"> <div class="col-xs-4 block-picto">
<div style="margin-bottom: 5px;"> <div style="margin-bottom: 5px;">
<span class="picto bg-color"> <span class="picto bg-color">
......
static/img/template.png

206 ko | W: | H:

static/img/template.png

208 ko | W: | H:

static/img/template.png
static/img/template.png
static/img/template.png
static/img/template.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@padding_left: 45px; @padding_left: 45px;
@padding_left_small: 30px; @padding_left_small: 30px;
@padding_right: 40px; @padding_right: 45px;
.text-middle { vertical-align: middle!important; } .text-middle { vertical-align: middle!important; }
.text-center { text-align: center; } .text-center { text-align: center; }
...@@ -152,6 +152,9 @@ span.header-client-nom { ...@@ -152,6 +152,9 @@ span.header-client-nom {
.table-lefilament td:last-child { .table-lefilament td:last-child {
border-right: none; border-right: none;
} }
.table-lefilament td.prix-total, .table-lefilament th.prix-total {
padding-right: @padding_right;
}
.remarques { .remarques {
float: left; float: left;
width: 480px; width: 480px;
......
...@@ -109,26 +109,26 @@ ...@@ -109,26 +109,26 @@
<thead> <thead>
<tr> <tr>
<th class="table-designation">DÉSIGNATION</th> <th class="table-designation">DÉSIGNATION</th>
<th>PU HT</th> <th class="text-right">PU HT</th>
<th>Qté</th> <th class="text-right">Qté</th>
<th t-if="display_discount" class="text-center" groups="sale.group_discount_per_so_line">REMISE (%)</th> <th t-if="display_discount" class="text-right" groups="sale.group_discount_per_so_line">REMISE (%)</th>
<th class="prix-total">MONTANT HT</th> <th class="prix-total text-right">MONTANT HT</th>
</tr> </tr>
</thead> </thead>
<tbody class="sale_tbody"> <tbody class="sale_tbody">
<tr t-foreach="doc.order_line" t-as="l"> <tr t-foreach="doc.order_line" t-as="l">
<td class="table-designation"><span t-field="l.name"/></td> <td class="table-designation"><span t-field="l.name"/></td>
<td class="text-middle prix-u"> <td class="text-right text-middle prix-u">
<span t-field="l.price_unit" t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/> <span t-field="l.price_unit" t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
</td> </td>
<td class="text-middle quantite"> <td class="text-right text-middle quantite">
<span t-field="l.product_uom_qty"/> <span t-field="l.product_uom_qty"/>
<span groups="product.group_uom" t-field="l.product_uom"/> <span groups="product.group_uom" t-field="l.product_uom"/>
</td> </td>
<td t-if="display_discount" class="text-middle" groups="sale.group_discount_per_so_line"> <td t-if="display_discount" class="text-right text-middle" groups="sale.group_discount_per_so_line">
<span t-field="l.discount"/> <span t-field="l.discount"/>
</td> </td>
<td class="text-middle prix-total"> <td class="text-right text-middle prix-total">
<span t-field="l.price_subtotal" <span t-field="l.price_subtotal"
t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/> t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
</td> </td>
...@@ -156,14 +156,14 @@ ...@@ -156,14 +156,14 @@
<tr> <tr>
<td class="total-title prix-u">TOTAL H.T</td> <td class="total-title prix-u">TOTAL H.T</td>
<td></td> <td></td>
<td> <td class="total-total text-right">
<span t-field="doc.amount_untaxed" t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/> <span t-field="doc.amount_untaxed" t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="total-title prix-u">TVA</td> <td class="total-title prix-u">TVA</td>
<td></td> <td></td>
<td> <td class="total-total text-right">
<span t-field="doc.amount_tax" <span t-field="doc.amount_tax"
t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/> t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
</td> </td>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<tr class="total-line"> <tr class="total-line">
<td class="total-title prix-u">TOTAL</td> <td class="total-title prix-u">TOTAL</td>
<td></td> <td></td>
<td> <td class="total-total text-right">
<span t-field="doc.amount_total" t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/> <span t-field="doc.amount_total" t-field-options='{"widget": "monetary", "display_currency": "doc.currency_id"}'/>
</td> </td>
</tr> </tr>
...@@ -241,10 +241,10 @@ ...@@ -241,10 +241,10 @@
<thead> <thead>
<tr> <tr>
<th class="table-designation">DÉSIGNATION</th> <th class="table-designation">DÉSIGNATION</th>
<th>PU HT</th> <th class="text-right">PU HT</th>
<th>Qté</th> <th class="text-right">Qté</th>
<th t-if="display_discount" class="text-center" groups="sale.group_discount_per_so_line">REMISE (%)</th> <th t-if="display_discount" class="text-right" groups="sale.group_discount_per_so_line">REMISE (%)</th>
<th class="prix-total">MONTANT HT</th> <th class="prix-total text-right">MONTANT HT</th>
</tr> </tr>
</thead> </thead>
......
...@@ -114,26 +114,26 @@ ...@@ -114,26 +114,26 @@
<thead> <thead>
<tr> <tr>
<th class="table-designation">DÉSIGNATION</th> <th class="table-designation">DÉSIGNATION</th>
<th >PU HT</th> <th class="text-right">PU HT</th>
<th >Qté</th> <th class="text-right">Qté</th>
<th t-if="display_discount" groups="sale.group_discount_per_so_line">REMISE (%)</th> <th class="text-right" t-if="display_discount" groups="sale.group_discount_per_so_line">REMISE (%)</th>
<th class="prix-total">MONTANT HT</th> <th class="prix-total text-right">MONTANT HT</th>
</tr> </tr>
</thead> </thead>
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<tr t-foreach="o.invoice_line_ids" t-as="l"> <tr t-foreach="o.invoice_line_ids" t-as="l">
<td class="table-designation"><span t-field="l.name"/></td> <td class="table-designation"><span t-field="l.name"/></td>
<td class="text-middle prix-u"> <td class="text-right text-middle prix-u">
<span t-field="l.price_unit" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> <span t-field="l.price_unit" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
</td> </td>
<td class="text-middle quantite"> <td class="text-right text-middle quantite">
<span t-field="l.quantity"/> <span t-field="l.quantity"/>
<span t-field="l.uom_id" groups="product.group_uom"/> <span t-field="l.uom_id" groups="product.group_uom"/>
</td> </td>
<td t-if="display_discount" class="text-middle" groups="sale.group_discount_per_so_line"> <td t-if="display_discount" class="text-right text-middle" groups="sale.group_discount_per_so_line">
<span t-field="l.discount"/> <span t-field="l.discount"/>
</td> </td>
<td class="text-middle prix-total"> <td class="text-right text-middle prix-total">
<span t-field="l.price_subtotal" <span t-field="l.price_subtotal"
t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
</td> </td>
...@@ -161,15 +161,15 @@ ...@@ -161,15 +161,15 @@
<tr> <tr>
<td class="total-title prix-u">TOTAL H.T</td> <td class="total-title prix-u">TOTAL H.T</td>
<td></td> <td></td>
<td class="total-total"> <td class="total-total text-right">
<span t-field="o.amount_untaxed" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> <span t-field="o.amount_untaxed" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
</td> </td>
</tr> </tr>
<t t-foreach="o.tax_line_ids" t-as="t"> <t t-foreach="o.tax_line_ids" t-as="t">
<tr> <tr>
<td class="total-title prix-u">TVA</td> <td class="total-title prix-u">TVA</td>
<td><span t-esc="'%.1f'%t.tax_id.amount" /> %</td> <td class="text-right"><span t-esc="'%.1f'%t.tax_id.amount" /> %</td>
<td class="total-total"> <td class="total-total text-right">
<span t-field="t.amount" <span t-field="t.amount"
t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
</td> </td>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<tr class="total-line"> <tr class="total-line">
<td class="total-title prix-u">TOTAL</td> <td class="total-title prix-u">TOTAL</td>
<td></td> <td></td>
<td class="total-total"> <td class="total-total text-right">
<span t-field="o.amount_total" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/> <span t-field="o.amount_total" t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
</td> </td>
</tr> </tr>
...@@ -231,10 +231,10 @@ ...@@ -231,10 +231,10 @@
<thead> <thead>
<tr> <tr>
<th class="table-designation">DÉSIGNATION</th> <th class="table-designation">DÉSIGNATION</th>
<th >PU HT</th> <th class="text-right">PU HT</th>
<th >Qté</th> <th class="text-right">Qté</th>
<th t-if="display_discount" class="text-center" groups="sale.group_discount_per_so_line">REMISE (%)</th> <th class="text-right" t-if="display_discount" groups="sale.group_discount_per_so_line">REMISE (%)</th>
<th class="prix-total">MONTANT HT</th> <th class="prix-total text-right">MONTANT HT</th>
</tr> </tr>
</thead> </thead>
&lt;tbody&gt; &lt;tbody&gt;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter