Commit Graph

727 Commits

Author SHA1 Message Date
Rémi Gaillard d473c04ebe [*] BO: store filter by category in admin products 2013-02-14 14:51:51 +01:00
vAugagneur d6f5566e65 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
gRoussac 3e9d0dda55 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00
vAugagneur b1c39da837 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur 57e883d6b2 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js 2013-02-11 10:30:32 +01:00
Rémi Gaillard 70b4ca535e [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +01:00
Damien Metzger 26a01f0a41 // Translations 2013-02-07 18:20:19 +01:00
Rémi Gaillard 655ab84d07 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
Rémi Gaillard 022464c578 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
Rémi Gaillard a28d23211a [-] BO: Fix #PSCFV-6497 display of list when deleting customers 2013-02-05 11:27:17 +01:00
vAugagneur 606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur d0d3180509 Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur 947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Rémi Gaillard d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard 459244002e [-] BO: Fix #PSCFV-7576 2013-01-31 16:54:30 +01:00
Damien Metzger bf9b1de873 // Fixed hook names 2013-01-30 16:03:37 +01:00
vAugagneur 210cc1ed01 [-] BO - fixed bug #PSCFV-6195 - Currency format not re-writing in product tab shipping 2013-01-24 18:26:29 +01:00
vAugagneur ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
gRoussac 39d7863eac [-] BO : fix css for iframe of custom products when creating order in BO 2013-01-23 18:38:00 +01:00
gRoussac 72c76e3b59 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries 2013-01-23 15:48:15 +01:00
vAugagneur 517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
Damien Metzger 710feb595a // Fixed typo 2013-01-15 13:54:06 +01:00
Damien Metzger 886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
sLorenzini c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
Vincent Augagneur 4192e58888 Merge pull request #150 from djfm/development
//Changed English strings using the translationsenglish module.
2013-01-04 08:06:15 -08:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Rémi Gaillard e7d5985d41 [*] BO: Improve form of catalog price rules #PSCFV-6099 2013-01-04 15:50:13 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Mats Rynge 230cd38839 [-] BO : Fixed a problem with the breadcrumbs in the admin category editing controller. The previous code used asort() which put the category breadcrumbs in the wrong order. 2012-12-30 00:24:03 -08:00
Damien Metzger 7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Gregory Roussac dbb8a9f2e0 [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
vAugagneur 912971263b [-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly 2012-12-14 16:12:25 +01:00
Damien Metzger 6e2ebf1c07 // Cleaned modules call 2012-12-13 14:38:55 +01:00
Damien Metzger b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
vAugagneur 06a3e4709b [*] BO : moved sample csv file 2012-12-13 09:16:03 +01:00
vAugagneur a100b1d220 [-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag 2012-12-12 17:38:31 +01:00
vAugagneur 42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Rémi Gaillard 8d2f5d6e42 [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard e8718ec42f [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
vAugagneur 221667a80d [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
Rémi Gaillard d42172e6f8 [-] BO: Fix #PSCFV-5706 save of product availability on global context 2012-12-03 17:53:47 +01:00
vAugagneur ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Vincent Augagneur 86f720398a Merge pull request #15 from axome/shipping_cost_admin
//6 decimals for shipping cost in admin tab
2012-11-29 05:40:56 -08:00
vAugagneur 8d6433f48f [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short
[*] BO : added prefix on credit slip reference
2012-11-28 10:56:43 +01:00
vAugagneur 0e0ca2a473 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
DamienMetzger 849b96ab9c [*] BO : the global search now looks into the modules 2012-11-22 17:41:12 +01:00
Xavier POITAU 034b26f82d When you set the "Fees by carrier, geographical zone, and ranges" (in the "Shipping" tab), the prices are tax excluded and displayed with 2 decimals, but the price is saved with 6 decimals in the database.
So when you define a shipping fee with 6 decimals it is saved without problem, but when you come back to edit the values, they are rounded (2 decimals) so you are forced to edit the values again, or else saving will replace the previous 6-decimals values with the displayed 2-decimals values.

Having 6 decimals displayed in the BO (not rounded, raw value from the database) is necessary because these values are tax excluded and are displayed tax included on the FO.
2012-11-22 14:14:02 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00