From 50cacfee3d5884ef4d5b1f77be6f9a2182be72ac Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Tue, 17 Oct 2017 13:24:38 +0200 Subject: [PATCH 1/3] lighter icon --- htdocs/theme/eldy/img/statut9.png | Bin 502 -> 428 bytes htdocs/theme/eldy/img/statut9_40x40.png | Bin 754 -> 644 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/theme/eldy/img/statut9.png b/htdocs/theme/eldy/img/statut9.png index e5304dd791bba49d3c56b11e2298b65f669e3dd5..49397d25520ca96de60b385586961d55ac51c203 100644 GIT binary patch delta 356 zcmV-q0h|8z1FQp(QGekI5epX(r?@fC0003wNkly?W8nvv8wYH`eCw|`q$-`v~-Up=P@iuS^l$nnauwRR!jt;V{ z2(%UmllQg;Syq(iEL#z9B2rvn0A@Bdh*f5@okha{B2tvuY)5?vO_n5t&{Y127E~XW z4y!)=!x3R3B3dw)@jq7Hzj z&b_;kBq)Qnw#0LoYDn`f~q)9F00Te{bbYZcQpezo{LaK$yE?WikdhWFdk*#D$ zzxMF|oO6DD2Qa$6rnk8X!1wXEh%vqlW`|z&IY2P`=vCjV$bY+XYpYq*xJlEnQ52+< z^lM%3#~9!K4B-(#N(lhx900lZGZA_9q%1!<=WNn6+)aRQb^ZEB2*+l|-%wQ^cz^u3 zEZ+ck249B5XJ+;x#<<23h{#k`U+h%XK!&4{k1-xCD+Y)$uEiLShNF>ppRcYSW~z;u zd0L>V;g?w<>wn$uZd);cnfdi@cUMwMd-vaNLrMwf+@A2Ch;#1ZKIb+#=SV4C$jy9y zsj8u^fvSd^`TSB=JDpqL>>sv2TkUjirRw#9h@6Yabm_ZArkTij)$0WT*r}?)N}ivp z>N2adlIN#St7-rslcoV+yWcy{D4^000SaNLh0L01m_e01m_fl`9S#00007bV*G` z2jL143l<+P933A300I$7L_t(o!`+!ta+@#^hJP&sVr(-R7dxG%Z#_fL)ZQ(*O3%=@ zBx7UBWC#vmOWT*g00rAPHfZ`ki_ynQEB(6?d!=x$lv0S3fbuz3KF~Wm#v>A^HL;r4UBZAChw3=R2Kckw2e*>I-`^pw=2e7_#NM_=r@RV(I&W zh%N^hCkZmG85fi!65e!rbllP3SOo!J8V&$5t$7s$d^R96<7u<`@RA;q<+^y{wD z1jmBwn!5)062}-@O@6o1T<5aKjHIJO7?ECa!cZAaB` z8Wp+snuP$sw(Xy$0TxVRuhgg>@R&Cw0FVP%``%UGJ5!m(>2_-jT$QB+yqV36$&@Nf z33y5oJ=p%Mu+$D}8yG!`O@mrKR}24*xh0wRGMDZHQy~3 z;*eP}zJd9Fw18_9nA$||f~`J7H1_aCo+17MUC$%a38Tm300000NkvXXu0mjffk6>B delta 724 zcmV;_0xSK51@Z-uDu2oV(E!mWdG=bVH9E8h<~C8o|Iq55JeG)XtRMBL!nSW-L_G$)fne|e?U)4{ONXS8(11tE0u6@e$Gt8*d6#X z7*PN9H4{ceD}Sds3)(t6L$h9ITLFm(onDXLhQpn+whVb%t>UWPW?6rdXW^dueG;yF zFkC#2a9uq0`;;|KD$o()-Vx$pu*GaSLckH?eyu4Ef&jlBA1OZ5juo79++1HXP1BZV zu+!@u9Ty*ConDWYPOj&&vkB3 zhQr*mmu5)aGmYq(`r>2VA7HVGKGNb6VNmaoKz~g<4!6SBn$evgL+jF zeT-N%%mFRagrV!X;Y`DTWtz*Yx~q13?Z(c&59W(zldUY=HBCdi(ResEu-#}pR8sap zYHucPeH^m8kc^sb Date: Wed, 18 Oct 2017 12:10:00 +0200 Subject: [PATCH 2/3] FIX: Bad localtax apply --- htdocs/expedition/class/expedition.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 9e057106dd8..7cfd19e6f1f 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2006-2012 Laurent Destailleur - * Copyright (C) 2011-2016 Juanjo Menent + * Copyright (C) 2011-2017 Juanjo Menent * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2014-2015 Marcos García @@ -1400,7 +1400,10 @@ class Expedition extends CommonObject $line->pa_ht = $obj->pa_ht; + // Local taxes $localtax_array=array(0=>$obj->localtax1_type, 1=>$obj->localtax1_tx, 2=>$obj->localtax2_type, 3=>$obj->localtax2_tx); + $localtax1_tx = get_localtax($obj->tva_tx, 1, $this->thirdparty); + $localtax2_tx = get_localtax($obj->tva_tx, 2, $this->thirdparty); // For invoicing $tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array); // We force type to 0 From df53870c01db2cb2d72b7c2faf86e4670c0ccf39 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 18 Oct 2017 12:13:32 +0200 Subject: [PATCH 3/3] FIX: Bad localtax apply --- htdocs/expedition/class/expedition.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 7cfd19e6f1f..879b5745db4 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1406,7 +1406,7 @@ class Expedition extends CommonObject $localtax2_tx = get_localtax($obj->tva_tx, 2, $this->thirdparty); // For invoicing - $tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array); // We force type to 0 + $tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $localtax1_tx, $localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array); // We force type to 0 $line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements) $line->qty = $line->qty_shipped; $line->total_ht = $tabprice[0];