Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
A
ap_report
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
Arbre et Paysage
ap_report
Validations
37a7f128
Valider
37a7f128
rédigé
Il y a 3 ans
par
Juliana
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
Change report template account and sale
parent
effaae82
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
3
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
3 fichiers modifiés
static/src/scss/layout_generic.scss
+0
-34
0 ajout, 34 suppressions
static/src/scss/layout_generic.scss
views/report_account.xml
+5
-9
5 ajouts, 9 suppressions
views/report_account.xml
views/report_sale.xml
+5
-9
5 ajouts, 9 suppressions
views/report_sale.xml
avec
10 ajouts
et
52 suppressions
static/src/scss/layout_generic.scss
+
0
−
34
Voir le fichier @
37a7f128
...
@@ -18,40 +18,6 @@ address .align-items-baseline{
...
@@ -18,40 +18,6 @@ address .align-items-baseline{
font-size
:
15px
!
important
;
font-size
:
15px
!
important
;
}
}
.o_report_layout_boxed
{
#total
strong
{
color
:
#1D4A23
;
}
#informations
strong
{
color
:
#489FAE
;
}
table
{
thead
{
tr
th
{
color
:
#489FAE
;
}
}
tbody
tr
td
{
&
.o_line_section
td
{
background-color
:
rgba
(
29
,
74
,
35
,
0
.7
);
}
&
.is-subtotal
,
td
.o_price_total
{
background-color
:
rgba
(
72
,
159
,
174
,
0
.1
);
}
}
}
.row
>
div
>
table
,
div
#total
table
{
tr
{
&
.o_total
td
{
background-color
:
rgba
(
29
,
74
,
35
,
0
.9
);
}
}
}
}
.o_report_layout_boxed
.row
>
div
>
table
.table-compo
tr
:last-child
td
,
.o_report_layout_boxed
.row
>
div
>
table
.table-compo
tr
:last-child
td
,
{
{
background-color
:
inherit
!
important
;
background-color
:
inherit
!
important
;
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
views/report_account.xml
+
5
−
9
Voir le fichier @
37a7f128
...
@@ -18,10 +18,6 @@
...
@@ -18,10 +18,6 @@
<span
t-if=
"o.move_type == 'in_invoice'"
>
Facture fournisseur
</span>
<span
t-if=
"o.move_type == 'in_invoice'"
>
Facture fournisseur
</span>
<span
t-if=
"o.name != '/'"
t-field=
"o.name"
/>
<span
t-if=
"o.name != '/'"
t-field=
"o.name"
/>
</h2>
</h2>
<div
class=
"mw-100 mb-2"
>
<p
class=
"m-0"
>
Du
<span
t-field=
"o.invoice_date"
t-options=
'{"widget": "date"}'
/></p>
<p
class=
"m-0"
>
Référent projet:
<span
t-field=
"o.invoice_user_id"
/></p>
</div>
<address
t-field=
"o.partner_id"
t-options=
'{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
/>
<address
t-field=
"o.partner_id"
t-options=
'{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
/>
<div
t-if=
"o.partner_id.vat"
class=
"mt16"
>
<div
t-if=
"o.partner_id.vat"
class=
"mt16"
>
<t
t-if=
"o.company_id.country_id.vat_label"
t-esc=
"o.company_id.country_id.vat_label"
id=
"inv_tax_id_label"
/>
<t
t-if=
"o.company_id.country_id.vat_label"
t-esc=
"o.company_id.country_id.vat_label"
id=
"inv_tax_id_label"
/>
...
@@ -51,7 +47,7 @@
...
@@ -51,7 +47,7 @@
<div
class=
"col-auto col-3 mw-100 mb-2"
t-if=
"o.invoice_user_id"
name=
"referent"
>
<div
class=
"col-auto col-3 mw-100 mb-2"
t-if=
"o.invoice_user_id"
name=
"referent"
>
<strong>
Référent:
</strong>
<strong>
Référent:
</strong>
<p
class=
"m-0"
t-field=
"
o
.invoice_user_id"
/>
<p
class=
"m-0"
><span
t-field=
"
doc
.invoice_user_id"
/>
<t
t-if=
"doc.invoice_user_id.phone"
>
,
<t
t-esc=
"doc.invoice_user_id.phone"
/></t></p>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -68,7 +64,7 @@
...
@@ -68,7 +64,7 @@
</th>
</th>
<th
t-if=
"o.company_id.vat"
name=
"th_taxes"
t-attf-class=
"text-left {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"
><span>
Taxes
</span></th>
<th
t-if=
"o.company_id.vat"
name=
"th_taxes"
t-attf-class=
"text-left {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"
><span>
Taxes
</span></th>
<th
name=
"th_subtotal"
class=
"text-right"
>
<th
name=
"th_subtotal"
class=
"text-right"
>
<span
groups=
"account.group_show_line_subtotals_tax_excluded"
>
Montant
</span>
<span
groups=
"account.group_show_line_subtotals_tax_excluded"
>
Montant
HT
</span>
<span
groups=
"account.group_show_line_subtotals_tax_included"
>
Prix total
</span>
<span
groups=
"account.group_show_line_subtotals_tax_included"
>
Prix total
</span>
</th>
</th>
</tr>
</tr>
...
@@ -119,7 +115,7 @@
...
@@ -119,7 +115,7 @@
<t
t-if=
"current_section and (line_last or lines[line_index+1].display_type == 'line_section')"
>
<t
t-if=
"current_section and (line_last or lines[line_index+1].display_type == 'line_section')"
>
<tr
class=
"is-subtotal text-right"
>
<tr
class=
"is-subtotal text-right"
>
<td
colspan=
"99"
>
<td
colspan=
"99"
>
<strong
class=
"mr16"
>
Sous-total
</strong>
<strong
class=
"mr16"
>
Sous-total
HT
</strong>
<span
<span
t-esc=
"current_subtotal"
t-esc=
"current_subtotal"
t-options=
'{"widget": "monetary", "display_currency": o.currency_id}'
t-options=
'{"widget": "monetary", "display_currency": o.currency_id}'
...
@@ -137,7 +133,7 @@
...
@@ -137,7 +133,7 @@
<div
t-attf-class=
"#{'col-6' if report_type != 'html' else 'col-sm-7 col-md-6'} ml-auto"
>
<div
t-attf-class=
"#{'col-6' if report_type != 'html' else 'col-sm-7 col-md-6'} ml-auto"
>
<table
class=
"table table-sm"
style=
"page-break-inside: avoid;"
>
<table
class=
"table table-sm"
style=
"page-break-inside: avoid;"
>
<tr
t-if=
"o.company_id.vat"
class=
"border-black o_subtotal"
style=
""
>
<tr
t-if=
"o.company_id.vat"
class=
"border-black o_subtotal"
style=
""
>
<td><strong>
Sous-total
</strong></td>
<td><strong>
Sous-total
HT
</strong></td>
<td
class=
"text-right"
>
<td
class=
"text-right"
>
<span
t-field=
"o.amount_untaxed"
/>
<span
t-field=
"o.amount_untaxed"
/>
</td>
</td>
...
@@ -166,7 +162,7 @@
...
@@ -166,7 +162,7 @@
</t>
</t>
</t>
</t>
<tr
class=
"border-black o_total"
>
<tr
class=
"border-black o_total"
>
<td><strong>
Total
</strong></td>
<td><strong>
Total
TTC
</strong></td>
<td
class=
"text-right"
>
<td
class=
"text-right"
>
<span
class=
"text-nowrap"
t-field=
"o.amount_total"
/>
<span
class=
"text-nowrap"
t-field=
"o.amount_total"
/>
</td>
</td>
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
views/report_sale.xml
+
5
−
9
Voir le fichier @
37a7f128
...
@@ -35,16 +35,12 @@
...
@@ -35,16 +35,12 @@
</t>
</t>
<span
t-field=
"doc.name"
/>
<span
t-field=
"doc.name"
/>
</h2>
</h2>
<div
class=
"mw-100 mb-3"
>
<p
class=
"m-0"
>
Du
<span
t-field=
"doc.date_order"
t-options=
'{"widget": "date"}'
/></p>
<p
class=
"m-0"
>
Référent projet:
<span
t-field=
"doc.user_id"
/></p>
</div>
</xpath>
</xpath>
<div
t-if=
"doc.user_id.name"
position=
"replace"
>
<div
t-if=
"doc.user_id.name"
position=
"replace"
>
<div
t-if=
"doc.user_id.name"
class=
"col-auto col-3 mw-100 mb-2"
>
<div
t-if=
"doc.user_id.name"
class=
"col-auto col-3 mw-100 mb-2"
>
<strong>
Référent:
</strong>
<strong>
Référent:
</strong>
<p
class=
"m-0"
t-field=
"doc.user_id"
/>
<p
class=
"m-0"
><span
t-field=
"doc.user_id"
/>
<t
t-if=
"doc.user_id.phone"
>
,
<t
t-esc=
"doc.user_id.phone"
/></t></p>
</div>
</div>
</div>
</div>
<xpath
expr=
"//div[@class='page']"
position=
"inside"
>
<xpath
expr=
"//div[@class='page']"
position=
"inside"
>
...
@@ -70,7 +66,7 @@
...
@@ -70,7 +66,7 @@
</th>
</th>
<th
t-if=
"doc.company_id.vat"
name=
"th_taxes"
class=
"text-right"
>
Taxes
</th>
<th
t-if=
"doc.company_id.vat"
name=
"th_taxes"
class=
"text-right"
>
Taxes
</th>
<th
name=
"th_subtotal"
class=
"text-right"
>
<th
name=
"th_subtotal"
class=
"text-right"
>
<span
groups=
"account.group_show_line_subtotals_tax_excluded"
>
Montant
</span>
<span
groups=
"account.group_show_line_subtotals_tax_excluded"
>
Montant
HT
</span>
<span
groups=
"account.group_show_line_subtotals_tax_included"
>
Prix total
</span>
<span
groups=
"account.group_show_line_subtotals_tax_included"
>
Prix total
</span>
</th>
</th>
</tr>
</tr>
...
@@ -122,7 +118,7 @@
...
@@ -122,7 +118,7 @@
<t
t-if=
"current_section and (line_last or doc.order_line[line_index+1].display_type == 'line_section')"
>
<t
t-if=
"current_section and (line_last or doc.order_line[line_index+1].display_type == 'line_section')"
>
<tr
class=
"is-subtotal text-right"
>
<tr
class=
"is-subtotal text-right"
>
<td
name=
"td_section_subtotal"
colspan=
"99"
>
<td
name=
"td_section_subtotal"
colspan=
"99"
>
<strong
class=
"mr16"
>
Sous-total
</strong>
<strong
class=
"mr16"
>
Sous-total
HT
</strong>
<span
<span
t-esc=
"current_subtotal"
t-esc=
"current_subtotal"
t-options=
'{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
t-options=
'{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
...
@@ -140,7 +136,7 @@
...
@@ -140,7 +136,7 @@
<div
t-attf-class=
"#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto"
>
<div
t-attf-class=
"#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto"
>
<table
class=
"table table-sm"
>
<table
class=
"table table-sm"
>
<tr
t-if=
"doc.company_id.vat"
class=
"border-black o_subtotal"
style=
""
>
<tr
t-if=
"doc.company_id.vat"
class=
"border-black o_subtotal"
style=
""
>
<td
name=
"td_amount_untaxed_label"
><strong>
Sous-total
</strong></td>
<td
name=
"td_amount_untaxed_label"
><strong>
Sous-total
HT
</strong></td>
<td
name=
"td_amount_untaxed"
class=
"text-right"
>
<td
name=
"td_amount_untaxed"
class=
"text-right"
>
<span
t-field=
"doc.amount_untaxed"
/>
<span
t-field=
"doc.amount_untaxed"
/>
</td>
</td>
...
@@ -171,7 +167,7 @@
...
@@ -171,7 +167,7 @@
</t>
</t>
</t>
</t>
<tr
class=
"border-black o_total"
>
<tr
class=
"border-black o_total"
>
<td
name=
"td_amount_total_label"
><strong>
Total
</strong></td>
<td
name=
"td_amount_total_label"
><strong>
Total
TTC
</strong></td>
<td
name=
"td_amount_total"
class=
"text-right"
>
<td
name=
"td_amount_total"
class=
"text-right"
>
<span
t-field=
"doc.amount_total"
/>
<span
t-field=
"doc.amount_total"
/>
</td>
</td>
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter