Commit Graph

1815 Commits

Author SHA1 Message Date
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
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
a2eda82603 //reduced informations block and added click to see more link 2013-01-16 11:07:29 +01:00
Damien Metzger
710feb595a // Fixed typo 2013-01-15 13:54:06 +01:00
vAugagneur
9a933d8818 //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur
71e863c6f5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur
ffbc326454 //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
Damien Metzger
886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
vAugagneur
7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
sLorenzini
c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
vAugagneur
d72a5d4d94 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
vAugagneur
5480cb4691 [-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php 2013-01-09 10:33:57 +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
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
Damien Metzger
62e70850fb [-] BO : Fixed warning in helper #PSCFV-6183 2012-12-18 15:47:09 +01:00
Damien Metzger
49319cbe4e // Typo in the name of an image 2012-12-14 17:14:01 +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
d930c479fb [-] BO : added check on a key in the helper list #PSCFV-6137 2012-12-14 10:13:28 +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
Vincent Augagneur
ebff913250 Merge pull request #69 from PrestaEdit/mails
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08: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
vAugagneur
ae7569bde3 [-] BO : added import button on listing 2012-12-10 10:14:03 +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
Jonathan Danse
edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484)
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +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
Vincent Augagneur
d08cb3b713 Merge pull request #30 from bumbu/patch-1
[-] BO : fixed bug #PNM-687 Back-office form field input with flag lang=>false cause error
2012-11-23 01:55:07 -08:00
DamienMetzger
fc7d62eddf [*] BO : added backup of the settings file whenever there is a modification #PSCFV-5676 2012-11-23 10:16:48 +01:00
bumbu
d1f77b787b Update admin-dev/themes/default/template/helpers/form/form.tpl
Fix error that appears on adding input with attribute 'lang' => false to admin controller form.
2012-11-22 23:31:44 +02:00
DamienMetzger
849b96ab9c [*] BO : the global search now looks into the modules 2012-11-22 17:41:12 +01:00
Rémi Gaillard
c5f52bcf7c [-] BO: Fix the product indexation only on the default shop #PSCFV-5227 2012-11-22 15:35:29 +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
vAugagneur
06fca34bd6 [-] BO : fixed bug #PSCFV-5141 - Product Url being rewritten when a product is edited 2012-11-16 13:21:53 +00:00