Commit Graph

8641 Commits

Author SHA1 Message Date
Francois Gaillard
0fb8bb1127 // Bug fix, no language is set when a employee is not logged yet 2013-03-20 16:06:48 +01:00
Rémi Gaillard
0924228fcd Merge pull request #335 from djfm/pdf
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv,...
2013-03-20 06:21:15 -07:00
djfm
6ab2ffaf12 // fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk 2013-03-20 14:13:37 +01:00
vAugagneur
a2362d1d6f // remove themeinstallator from install modules list, now install from addons 2013-03-20 11:25:45 +01:00
Damien Metzger
40bddde9cc // Code cleaning thanks to maofree #PSCFV-7953 2013-03-20 11:21:56 +01:00
Rémi Gaillard
a6da2c12a0 [-] FO: Fix #PSCFV-7600 display accessory in the product page even if there are no stock for the default combination (on the default theme) 2013-03-20 11:14:33 +01:00
vAugagneur
b95b5861ef [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
Damien Metzger
77002bb3f5 [-] BO : fixed product indexation markup in import #PSCFV-7695 2013-03-20 10:43:18 +01:00
Damien Metzger
d683478818 [-] FO : fixed attributes order #PSCFV-8032 2013-03-20 10:31:51 +01:00
Rémi Gaillard
0a54da23d8 // small fix for value of default refund displayed 2013-03-19 13:50:21 +01:00
gRoussac
319d6ddec8 [-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true 2013-03-19 11:34:54 +01:00
Francois Gaillard
2bdb188634 // Bug fix : Mobile, js errors fixed 2013-03-19 11:16:40 +01:00
gRoussac
39b120bbb4 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00
Francois Gaillard
cd60e6785e [*] Mobile : OPC, display carrier price, gift wrapping price and gift products 2013-03-19 10:01:07 +01:00
Francois Gaillard
3cd5de42b0 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-19 09:47:46 +01:00
Francois Gaillard
fef6c04f32 // Debug removed from shopping cart 2013-03-19 09:47:39 +01:00
Damien Metzger
bf171af16a [-] BO : added important check of the default language for ObjectModel multilang properties 2013-03-18 17:48:37 +01:00
vAugagneur
5b2465e9bb //small fix when click on install button on tab module list 2013-03-18 15:27:56 +01:00
vAugagneur
7bcc1ff651 [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
Damien Metzger
d346307c97 // Small fix 2013-03-18 11:49:45 +01:00
Damien Metzger
83b6c3bbab // Clean code 2013-03-18 11:08:57 +01:00
Rémi Gaillard
f483feb53d [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
Francois Gaillard
bd1cc77cf1 // Version number updated 2013-03-18 10:47:50 +01:00
Francois Gaillard
97490b5e7b [*] Mobile : Shopping cart displays gifts 2013-03-15 17:24:00 +01:00
Gregory Roussac
2dfe1826e9 Merge pull request #325 from DrySs/patch-3
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
2013-03-15 17:12:02 +01:00
Rémi Gaillard
0f2551f5d6 // Remove unnecessary fsockopen 2013-03-15 16:25:19 +01:00
Rémi Gaillard
f17f9c9bee // Fix product multishop association when the product is created before the shop 2013-03-15 15:23:18 +01:00
Francois Gaillard
001cf9a5bd [-] Mobile : Bug fix : Combinations, radio buttons without select 2013-03-15 15:00:49 +01:00
gRoussac
ea804bb79d Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-15 14:38:07 +01:00
gRoussac
9aada9f24b [-] BO : Fix live edit link 2013-03-15 14:36:59 +01:00
Rémi Gaillard
e3ea401fe0 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
gRoussac
fe02aceddf [-] FO : remove 404 images in Live Edit 2013-03-15 14:23:12 +01:00
Rémi Gaillard
85b0a24fdb // same on admintabs 2013-03-15 12:11:47 +01:00
Rémi Gaillard
4c0a7ca161 // delete multishop toolbar on adminstatuses 2013-03-15 12:07:53 +01:00
vAugagneur
905eca2fd0 //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur
24602d3fd1 //removed moneybookers during install 2013-03-15 12:02:16 +01:00
Rémi Gaillard
e1bb55dbba // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Rémi Gaillard
8244e15408 // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
gRoussac
96afbb53cf // remove warning in multishop 2013-03-14 17:49:07 +01:00
Francois Gaillard
3599958b5c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
Francois Gaillard
70d79c5983 Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler"
This reverts commit da77ce1029.
2013-03-14 17:01:16 +01:00
gRoussac
28285efb31 // again remove additional \t 2013-03-14 16:58:28 +01:00
gRoussac
99fc6fb857 // remove additionnal \t 2013-03-14 16:55:06 +01:00
gRoussac
094c12f991 [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader 2013-03-14 16:53:26 +01:00
Francois Gaillard
505d3be5c3 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Rémi Gaillard
395192f603 Merge pull request #315 from PrestaEdit/followup
[-] MO: followup - fix bug in template vars
2013-03-14 07:52:15 -07:00
Rémi Gaillard
0da58b215c [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard
8b4bd8e471 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
Rémi Gaillard
c7a4c4d84d // Fix 404 img path on pagenotfoundcontroller 2013-03-14 14:58:44 +01:00
Rémi Gaillard
26f0608071 Merge pull request #299 from samy-r/dev-import-time
Import time improvment
2013-03-14 14:29:20 +01:00