From 914cfe3975ae0a1e0768d046c93b8cb457f26130 Mon Sep 17 00:00:00 2001
From: Laurent LE CORRE <laurent@thecoredev.fr>
Date: Fri, 8 May 2020 10:21:46 +0200
Subject: [PATCH] =?UTF-8?q?On=20d=C3=A9place=20le=20champ=20"Frais=20de=20?=
 =?UTF-8?q?livraison"=20dans=20la=20facture?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sess_626cc7572424060af857bf8311580d33        | Bin 1584 -> 0 bytes
 .../sess_81bdd48462de3f578ed871eb68abf9e8        | Bin 1642 -> 0 bytes
 .../sess_96c93632e3be69033eceddd59f82e85d        | Bin 1640 -> 0 bytes
 .../sess_e8a67c24b94967afecc41de529bb0a0b        | Bin 1640 -> 0 bytes
 templates/pdf/default2020/invoice.html           |  10 +++++-----
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 local/session/sess_626cc7572424060af857bf8311580d33
 delete mode 100644 local/session/sess_81bdd48462de3f578ed871eb68abf9e8
 delete mode 100644 local/session/sess_96c93632e3be69033eceddd59f82e85d
 delete mode 100644 local/session/sess_e8a67c24b94967afecc41de529bb0a0b

diff --git a/local/session/sess_626cc7572424060af857bf8311580d33 b/local/session/sess_626cc7572424060af857bf8311580d33
deleted file mode 100644
index eec9c43308469baf5a661ed2da022280f0196c47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1584
zcmd5++j7$|5bdXQJku9u()tqP#Cd|0mT+m>x}goz8IK~%L?By6mq1$j!uRl1d<iSb
zNg8P0$xEy~tKG9_wVTT_%#l)p&a@)(2THr?y-dR>_0*g&iVm?Bg4C-0$4hT8PQxJe
zt}J}}o)?7O4y_Y_X%w3K&r@&j*<MY)d4pN%4`dqn)&jmnkz#G_S!=}$T2fLBInz}w
zy#Y%7^!@>EB^F;$p)_Luz_CRsgrjKyNt`zZMjo7?gjbVG^VPS0a#_tdYmwhSe{GPG
ziwY@ohKL9C{sB-}MH5Itw8F-3i&#)eXAG<^YXD+Eu??40QC_djkRQymWnPdHX$J9I
ze+OVeAanuZ8%05gV>n*Xihzbj!fxsnHaBzw<P7~F?)YKHkM{k(u>|p<Z-0hsVEP4j
z?|4mewQMZ82mpw?vRl6pMA3pb<mem;3UwNl9U<MAeE$(4%o!Vtf(W2_2DOCl4Q<R&
zf}#joYR~{m1HBD81bcfYaJ^q!*H>n?qmM$K3tnif&IQF}m2mZ-7~4YEK`g6{Q-&BB
zm!%}Cod>##6hSvza!)yJ2i%mo8mm#zGh^{rx-E1oMBwHRF?eIea#Uw%0WYGRM2BHF
z*6%n5((ThHbw0_=ci3v_e69qlB}3+MuShsmxou8{=cLe#6enC9oB6gwV7a>S#-<&+
zy&^}bd943#@2-2S@(HPTUusjhn(@-gxyu^{B7~OaSc>w<?Z6yssdz<1&iE$^6Ase}
zG{T#)X8PqgxV%tobUd97d*5YJWpC)^+g=r2<E9hqI2w*mFYN5WaxqfmT9O=d{)K|>
zRwh^=+v$uKDqyd<MA>VUC7ovS;dC+Ye)jQbicU&-a{cvenk+spM*TjUlsC=f#T_Ji
z$jwSG8Ip6m&&?*ariv&8``s=V$f)f;ij!^>MZF*~69oJo8RMkqjCN-N=tJ;7FM{c1

diff --git a/local/session/sess_81bdd48462de3f578ed871eb68abf9e8 b/local/session/sess_81bdd48462de3f578ed871eb68abf9e8
deleted file mode 100644
index 6db0d823d7babd0a201f55d78307feea159af7af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1642
zcmd5-$!^;)5Y49q0&*#kMw=6xJ|(dWyS1};L7O0eKvPuAh87)?a;m1i^n3bM{gMtz
z$qO3a>x-;;!#9t!DN$LNV67#a6`HCa7{%ySp)f+8o>R{7ds0YAb6q`2>9wy>7$9$A
z;fJ9}DSx=MP5`1PH0Mu|cku2Yr!QW6hWxfdfp0C~OEpc`)~2;CM9MNo(@VjNMXtOy
zMm~D|38&61zG6}rm~X*0NB|=H<76^AzZwtDC*6)`0wFIj&ld7n(9Dyo^I_M#$H?mz
zQh05kZCF+YG8hT~b5RJ~#CQU0cRH##;1;S}%mlBHKfiu&kW9!0*5(};kMhGKkY2M%
ztbr}H{MF@GOtBdUtBV?dRG?o9#WWN7+6?i*JS&rwX1L(MU->(LND9;`6wOou64-&)
z30qLey-7V>G_|pzicp5o4;sgQc<e`qe#=;b#(UrXj8>CE4QIcLoF=+lT5%Boz+2mE
zKa;*CJ-MKgGf->F;}jK36YzghL<Hy8GNlp<as{^uUH5IwH&|+hp{NE8LYr}eUV^<k
z6F>(+9oE+Mk(sUO7Uhi;X+iXjWQ5iM>z3kt2VIj`RU4-<=JYzt6xG!vv6?A@dR8*t
za@r-_T(cg?KFq+sns(3~ioi`S=Fnwn+0Vy#1wB#Cu)~O32m?Vtbk+PcPo`t@Kdf@;
zd?pg-ieuB>wFsA0VT&^+bD9>MrXPgtn9X3vz^2A624c#w-z##0mfQK??;X2tRd1wv
z|Dh^`yE7?mI`?_QM1)Y%geaMvxb2ycLTRy}GU4LUObyH@$QWLP#qi}e?g$l6{b{e2
zj=D*!e>WJ&FZ0vzS@OsD>D%D8ncvyzgY{xkkraw1M2IH_dADhT6|x)7c;OT_n+vpf
z4u+$r<YWKypq$>dSnu?{HRMBiPd@oyv&O1<%v(XPocD;?jEVUeWE`ux{SufRY)uQQ
lF?<>9dVz?A-AIkIIEv!fH`@Y?WXl-Fr_N}%CV)PW{{@x+`3?X8

diff --git a/local/session/sess_96c93632e3be69033eceddd59f82e85d b/local/session/sess_96c93632e3be69033eceddd59f82e85d
deleted file mode 100644
index e7212ae510c43ed15ac5b02fd00ea3b256e73ce6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1640
zcmd5-+fExX5bdX+m3XNH>?I+@c}hc&A|Od~p@5K9j_plMz3a&Kf&%SJzo%c-FX`Cc
z+*I=3yli&P_{^CZ&upr*IK{>&J}V8=KQOAHca7o%1!lnn$ET!JiWR1Ml2y<epg2Oo
z#KBLuk}~nsaZUiDB(~?zQSj;Wr-Ho(tr-ei8bzVAfG;zQZmbv1noG(v&S*!9GB0${
z!YD-VKjBov;V)d75{n(!1&KgpZ=6m>?f&?tJ?UNsHV_IT`)s0sM;ArfZ{K$9dkqEM
zQpunNv~|bIK?X+=U_J_gOsprccBi9?1G3Pod?rPO{Q32Ji)2#e*w}YqJT8uoLHe3a
zVFPT`@mI;eaLs1|tUhW4Qh|OcH8)%q8#BZQ^K6w;mf=zWf93B1q8Lz9XqxQ=6z~#W
zCp>3Rds}))l)Bi^MQB4DM)i|0J_(bfuxTw({WNqxtJRj!z}Yuhu+*%UPFw;2@UHF7
zFZShIva=yp9P+f?@q)^wjrSi3B2tKfqD+CzKI9VnySFt%3Wj57sYN454eD*t4%n+R
z5!|0$>*mPJb##Yvs3a|k87fZLI^g<339*N6NSvyz(-;dj$TH1LHAj5Slt4Et86P?A
z6K>O7k7Exe;9pI9=pIGn=N1dNV|3Lk#`pzpL^Z)4BYqv+NCKj(tIvvbI=27gs+Qho
zqHv)FwwHS?!dF$g=8VaL(NZvaCDo<f3vLKpY5ZCswjGDP5-(`ETmQq}HGf(42c<rI
zs0!h8CM#FYL*6hDF|;%#T4iT`cc!G&M&?YVLe4o%I7}zV5YZy<m*VZAIY_(7xA>w%
zt{-N!cf%g@NB+2I+^^`vXf!EQ+sz&<7h8(7)GQ@Ze&<kkS0-2>`{Aq?rm)w1ps%qW
z3`CNBnLS?*YvFu)A73?}?{xoee*S8%M&V#SpZ3(~{&@-mo!U=9Ca_+(?||LF&XhBQ
l;k)3L3q&m4KB_lrNs`pVhMgeLw_~g|Yu@N~CV(N3{{`mW`4s>F

diff --git a/local/session/sess_e8a67c24b94967afecc41de529bb0a0b b/local/session/sess_e8a67c24b94967afecc41de529bb0a0b
deleted file mode 100644
index a44c5951e24db2b1f4e07c6e3c8c081f45c7488e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1640
zcmd5-OK#gR5Y15n0ofEtB1-a)UZsu$xOHqNa?m6QAkY$Jv!O+Yq};e^H$6{J)su8c
z%0D#T*Be>$hHu`?a7KyBgM?@;*`(A|{UA8PZwdz?_VkQ$M$XbwN?PdZnXbI{5C;f*
zV+%iBi;VK8j&%YMhk-d?$KKJ0qk?|(+7s-z6-K_bfG^cF+gO{{Iu{ws8O=I^m-9k-
zZGwIL_7hGuEWTt?mxS-YHV6Wdy*L@)UJT;?#khOvnLyY>=Gnp?L(L)?TwHg}dxX7i
zDTUVt+L~o$AcJ89n2VA^CdLz3yLY!02V|jE^NHXU^5@s@Es_g4C)&IN<4JLR0@BxP
zl4xMdEPs{!k|{RfV0BRuNCo<ZP)svXY|IcJ%#&4;(VUbV_$z-0q>=)422C@afC65^
z>zK_c)ZUaH63uLE=pwWs@KNp54^I8?*l!sNs-5}vXSA9UYB>8{6g1JRg%uY90K99v
z^$T427W8~XB!fIncbuSdVdDKqf>OcxP-awu%mL&QxVyJCLkgM^XsJOFqz3giXb0@o
z83gxd*Sa|}u^ru^97&OtsUAs|(sjV~h2ne<-H=#STc?<CI?QuLbu~w9%@jg6D;e)O
z?GtX(T#sW9Cg5L9d*~hoa&t>K+_7xcD`K*Q8&OTL!&0{n`XU9<)zzm(au=KbK~+oV
zGnS-KoS4hK7U8NYY;)ptMzfOB>`KT>vlr|T*wVPQkeYTJ_6nV##cur%dq?iFs&`6#
z_)rzX<(#f;IS+ZmKm^dzBvmp$ce^u5OQpq}%7lw4g9(S}1R3%Dr>-A`arZTO?2ZvC
zUIw4h$CsY}<+1U6OQwB2oi>JF?}Fgk&K@imQ;MWiG)aYcW>9xqCRiZ*;fxo_V6VAA
z(WrkFJS4Sc{j_zzdXP6oIBq`X({l0PFN?)&iE66xdc!+m1OuIzPeIO!n%VDw*}&E`
nr<%Zb!7dkwSlWG5YeZofHT}AoAkepCtfQ7Q+MNlY59EIVpEviK

diff --git a/templates/pdf/default2020/invoice.html b/templates/pdf/default2020/invoice.html
index 1e577341..b7f71381 100644
--- a/templates/pdf/default2020/invoice.html
+++ b/templates/pdf/default2020/invoice.html
@@ -323,6 +323,10 @@
                         <td class="table-3-1"><p>{intl l="Total without tax"}</p></td>
                         <td class="table-3-1 align-right"><p>{format_money number={$TOTAL_AMOUNT - $POSTAGE_UNTAXED} currency_id=$CURRENCY}</p></td>
                     </tr>
+                    <tr>
+                        <td class="table-3-1"><p>{intl l="Postage"}</p></td>
+                        <td class="table-3-1 align-right"><p>{format_money number=$POSTAGE currency_id=$CURRENCY}</p></td>
+                    </tr>
                     {strip}
                     {capture name="tax"}
                     {foreach $taxes as $name=>$prices}
@@ -340,7 +344,7 @@
                     {/foreach}
                     {if $POSTAGE_TAX != 0}
                     <tr>
-                        <td class="table-3-2"><p>{intl l="Postage"}<br>{$POSTAGE_TAX_RULE_TITLE}blabla</p></td>
+                        <td class="table-3-2"><p>{intl l="Postage"}<br>{$POSTAGE_TAX_RULE_TITLE}</p></td>
                         <td class="table-3-2 align-right"><p>{format_money number=$POSTAGE_TAX currency_id=$CURRENCY}</p></td>
                     </tr>
                     {/if}
@@ -357,10 +361,6 @@
                         <td class="table-3-1"><p>{intl l="Total with tax"}</p></td>
                         <td class="table-3-1 align-right"><p>{format_money number={$TOTAL_TAXED_AMOUNT - $POSTAGE} currency_id=$CURRENCY}</p></td>
                     </tr>
-                    <tr>
-                        <td class="table-3-1"><p>{intl l="Postage"}</p></td>
-                        <td class="table-3-1 align-right"><p>{format_money number=$POSTAGE currency_id=$CURRENCY}</p></td>
-                    </tr>
                     <tr>
                         <td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{intl l="Total"}</h3></td>
                         <td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT currency_id=$CURRENCY}</h3></td>