From ed01281fca76008da9963b5b59a5e6f0ee975d84 Mon Sep 17 00:00:00 2001 From: bMancone Date: Tue, 8 Nov 2011 16:02:08 +0000 Subject: [PATCH] // Stock git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9971 b9a71923-0436-4b27-9f14-aed3839534dd --- .../helper/list/list_action_addstock.tpl | 2 +- .../helper/list/list_action_removestock.tpl | 2 +- .../helper/list/list_action_transferstock.tpl | 2 +- controllers/admin/AdminStockMvtController.php | 19 ++++++++++++++++-- img/admin/add_stock.png | Bin 0 -> 796 bytes img/admin/remove_stock.png | Bin 0 -> 755 bytes img/admin/transfer_stock.png | Bin 0 -> 3819 bytes img/t/AdminStock.gif | Bin 563 -> 622 bytes img/t/AdminStockMvt.gif | Bin 1709 -> 416 bytes 9 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 img/admin/add_stock.png create mode 100644 img/admin/remove_stock.png create mode 100644 img/admin/transfer_stock.png diff --git a/admin-dev/themes/template/helper/list/list_action_addstock.tpl b/admin-dev/themes/template/helper/list/list_action_addstock.tpl index 945bf23ee..a3dd29a3c 100644 --- a/admin-dev/themes/template/helper/list/list_action_addstock.tpl +++ b/admin-dev/themes/template/helper/list/list_action_addstock.tpl @@ -24,4 +24,4 @@ * International Registered Trademark & Property of PrestaShop SA *} -{$action} \ No newline at end of file +{$action} diff --git a/admin-dev/themes/template/helper/list/list_action_removestock.tpl b/admin-dev/themes/template/helper/list/list_action_removestock.tpl index 551cab4c9..2a01ff537 100644 --- a/admin-dev/themes/template/helper/list/list_action_removestock.tpl +++ b/admin-dev/themes/template/helper/list/list_action_removestock.tpl @@ -24,4 +24,4 @@ * International Registered Trademark & Property of PrestaShop SA *} -{$action} \ No newline at end of file +{$action} diff --git a/admin-dev/themes/template/helper/list/list_action_transferstock.tpl b/admin-dev/themes/template/helper/list/list_action_transferstock.tpl index 0703b3eb8..dab100dc8 100644 --- a/admin-dev/themes/template/helper/list/list_action_transferstock.tpl +++ b/admin-dev/themes/template/helper/list/list_action_transferstock.tpl @@ -24,4 +24,4 @@ * International Registered Trademark & Property of PrestaShop SA *} -{$action} \ No newline at end of file +{$action} diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index 873a7e683..02d123fa2 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -55,8 +55,8 @@ class AdminStockMvtControllerCore extends AdminController '-1' => $this->l('Decrement'), ), 'icon' => array( - -1 => 'arrow_down.png', - 1 => 'arrow_up.png' + -1 => 'remove_stock.png', + 1 => 'add_stock.png' ), 'orderby' => false ), @@ -217,6 +217,21 @@ class AdminStockMvtControllerCore extends AdminController 'width' => 200, 'havingFilter' => true ), + 'sign' => array( + 'title' => $this->l('Sign'), + 'width' => 100, + 'align' => 'center', + 'type' => 'select', + 'filter_key' => 'a!sign', + 'list' => array( + '1' => $this->l('Increment'), + '-1' => $this->l('Decrement'), + ), + 'icon' => array( + -1 => 'remove_stock.png', + 1 => 'add_stock.png' + ), + ), 'physical_quantity' => array( 'title' => $this->l('Quantity'), 'width' => 40, diff --git a/img/admin/add_stock.png b/img/admin/add_stock.png new file mode 100644 index 0000000000000000000000000000000000000000..ce36e4fc1b8e4f23bcf0103766ea21e636ea0120 GIT binary patch literal 796 zcmV+%1LOROP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipq> z4m%H^+JF%N000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0007aNkl2)d?j7frn)CxI5mH(aXj5r{QVX>P7quuNTLno-XwhVgc5eECutl3( z1ufiF+i+FTA|$Al36WT-7*3A!cbhxsp1-d%fxGd}72MTFKt9yakeWF9eechG@n@>#@0dj(sQ@=NJWtupkao(63+ct z%f8{E^YKVgWN>2i$^ohLvy&rRn=0umMs#oh?p*FYo*3!xt6R;dG4G`aQ!eQ^w7YR? zdMVa?D*DmHwXz;4&_U-d=k~za6E`k&x9nO-{XnVnMAIDPyj7%C8S?OENB457aPRu# zhIUNHtI9zF0Zk1%E?(+6x+h=o3zRYAF$jmI|wlKgncT# zZyU5)l@`FYaiIkgY7&Z2$t?PMyrY?}x4fhc1gyc8##O0(kV+5)MNlKyHeq>0Oeg)o zm_q@i#FS7Rgl1qI05QQ@wp}Q2l*|=@F^2*Oi8+NO2R)U0ubtwqMkl{^;f74!npj$ aXZ`@}LOqdZrL7MD0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipq> z4muG-&Wtkv000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006`NkleYw= z(XfSjX)XBHG{BuxpBMrn6u+s{;>aS=} zihpVfpkC4aY(#yH%pm~F6I66>Qt|lQNfTruJK&%!43V-SDYOjY^U~y|8nQ7o1ZaRQ zvlWSC3d(3o)j=u%X}bpiWQR$lA_v4b(6kOLSr0+Oo=iq2pb=tU8bHGtJYJpXj*D30 z9AF5jL?6)zDE#9~VGSj+ucE8BPWOEc1I{AI45R_8r2|nb3ORdw(mUVU0=u0#Tq?|O z>HT;OzeTHe2fvR_z%XsIbt0PqrC|4q0Fc1xc7nDcN3E~3zp_Xtt~~cQ_5&O!(Tkg@u(td@ve&>2$=-Cj4aqjFzniAv>e*xm8hqInb5k5IN8Js&h9KoglwmaJ3^T*7h za`{5xfiDv|*b;AYVcs{Yg{POFWsAG<#UFLx!~1MeDV|O$9%EDga30Ni`HJscLfN~H lE_+Xk|46Z=hat%d{057u9+3k6$;AKw002ovPDHLkV1iqDNtyrv literal 0 HcmV?d00001 diff --git a/img/admin/transfer_stock.png b/img/admin/transfer_stock.png new file mode 100644 index 0000000000000000000000000000000000000000..d2d0d924159811de91d3069beab195fcd6561a96 GIT binary patch literal 3819 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 literal 563 zcmZ?wbhEHb6krfwIOfjKu-3F;i$d>i-JU&Wy?c!(91!f?r{A|#FEq$h4Rdj z31pDc`A4D}2;3_t*iCHX`UTxkYX{4*8rLV82r>?7O(7~gmsiC2%%s7QtMpf;k!jyVW zF*$iTMX9swLee*-CC;+(i9Qe)KFh+*FYrR-EHf+DJ1)Vq3`}3XaGd?o)W~2B05^uz*?Ck9A?d|mR z^#A|=A^r(dbZ=v8AWe3303rDV0SW*=04x9i000mG5C8xMu)v>i*eP~~$fU;S(ob{rSSv3hLJtpbC>sxi z8z^yw4LdL#}%a~RLJR-#vYYx;GW1Dl&RpK!yZ?z;S$HD zY{cl1%7m(3BGW8j&}?w-Kv8L4UM&uSgW>Kf1H6wMlxuAykaSk&eon9rWy z;^Z8|mfz|msm5sJ%IuTDrl89dmZ|TP#ZlbhDXYaOtIcQ~#9|-8Y8%3$W5*Pbs%+rG zZ0yS6n<^2QA*b)a**qyJxz-@4fHS^KKRnwYvP@Fj7N|@$BugbQTT;P*F}_kgC{@QP zRKh<^);5$Sq)5myk~O|cJ-$@mF-$17RKp{gHLgMHY5gN(z}Nwo2iqz6QPp&Z!xh9#uuD!Bu`C z$yM3OmMKd1b_zBXRu#Dgxv3?I3Kh9IdBs*0wn~X9`AMl(KsHENUr7P1q$Jx`$q^)> z0J76LzbI9~RL?*+*}%*|!OT$4(AdP>++0V&$iUD*-@r)U&`8(N+{)O<%D_MY3Y37h z6{VzE1-ZCE?E>;_l`=|73as??%gf94%8m8%i_-NCEiElUW*8ai0#)c1SLT%@R_Nvx zE5l51Ni9w;$}A|!%+FH*nV6WAUs__T1av9H3%LcpzHo!{iuJ%A(o4?I)vrh_&^OdG z(9g{U`3tPNxFjeQ;S8**i$f|4QuTvUi}Op1l2d`om0_BJVTa!$kV2qqto(~IfsvA! zP;G0~2ExV$P$&N=+=uFAB-e&w-_YfQ9{rvI$+t)9jKYjf0{@vR*uV1}<@%-7-CyyUJd~pBX-8;8$-Mn%A+SMzU zFI~KF{@mF!r%#aDv3%Lm zC5sm=Trhv$+&Qyn&73iP+SDnNCrzBt-`CsI-PPIA-qzaE+|<}mUsqdGT~%38URGLC zTvS+)pO>4Hot2r9o|c-DoRpXl9~T=F9Tgc79u^uB926Mf@8|2|?d9p=?&j*^?BwWR zZ)a;`ZDna;Zf0s?Yy`}fdb&E=TACW_YN{&AN{R~daM-~