Commit Graph

6583 Commits

Author SHA1 Message Date
Rémi Gaillard 37489c752c // Fix htmlentities on csv export 2013-03-21 10:08:24 +01:00
Rémi Gaillard b2d1270433 // Fix htmlentities on csv export 2013-03-21 10:08:24 +01:00
Rémi Gaillard 34743b465b // Small fix 2013-03-21 10:02:36 +01:00
Rémi Gaillard 6be433a2fe // Small fix 2013-03-21 10:02:36 +01:00
Rémi Gaillard 646a68ef16 // oups 2013-03-20 20:13:38 +01:00
Rémi Gaillard 72f49a93f4 // oups 2013-03-20 20:13:38 +01:00
Rémi Gaillard 17c9814f63 [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images 2013-03-20 20:12:28 +01:00
Rémi Gaillard 5f181c8e4c [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images 2013-03-20 20:12:28 +01:00
vAugagneur b901447827 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 17:28:58 +01:00
vAugagneur f8fd67e2c4 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 17:28:58 +01:00
vAugagneur 697f3fb71a [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter 2013-03-20 17:28:51 +01:00
vAugagneur ecfb24dad4 [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter 2013-03-20 17:28:51 +01:00
Rémi Gaillard b1c47c4fde [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed 2013-03-20 17:17:26 +01:00
Rémi Gaillard 02d58956c8 [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed 2013-03-20 17:17:26 +01:00
djfm adf6786d40 // 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
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 04c3b54c38 // remove themeinstallator from install modules list, now install from addons 2013-03-20 11:25:45 +01:00
vAugagneur a2362d1d6f // remove themeinstallator from install modules list, now install from addons 2013-03-20 11:25:45 +01:00
Damien Metzger 2fb9b140f0 // Code cleaning thanks to maofree #PSCFV-7953 2013-03-20 11:21:56 +01:00
Damien Metzger 40bddde9cc // Code cleaning thanks to maofree #PSCFV-7953 2013-03-20 11:21:56 +01:00
vAugagneur b70497189d [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
vAugagneur b95b5861ef [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
Damien Metzger 967a01f2ae [-] FO : fixed attributes order #PSCFV-8032 2013-03-20 10:31:51 +01:00
Damien Metzger d683478818 [-] FO : fixed attributes order #PSCFV-8032 2013-03-20 10:31:51 +01:00
Damien Metzger 6fdb4890cd // Made order message checks more flexible #PSCFV-8123 2013-03-19 16:39:02 +01:00
Damien Metzger 51bac2107f // Made order message checks more flexible #PSCFV-8123 2013-03-19 16:39:02 +01:00
gRoussac b9649c754e [-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true 2013-03-19 11:34:54 +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
Damien Metzger ce4148b89a [-] BO : added important check of the default language for ObjectModel multilang properties 2013-03-18 17:48:37 +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 734c5a7c8f [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
vAugagneur 7bcc1ff651 [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
Damien Metzger e549207b8d // Small fix 2013-03-18 11:49:45 +01:00
Damien Metzger d346307c97 // Small fix 2013-03-18 11:49:45 +01:00
Damien Metzger a0f97f5425 // Clean code 2013-03-18 11:08:57 +01:00
Damien Metzger 83b6c3bbab // Clean code 2013-03-18 11:08:57 +01:00
Rémi Gaillard f6674417cb [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +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
Rémi Gaillard 27ef057564 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
Rémi Gaillard e3ea401fe0 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
Rémi Gaillard d4d0661ff8 // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +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 564aafd10d // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
Rémi Gaillard 8244e15408 // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
François Gaillard 138c225845 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
Francois Gaillard 3599958b5c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
François Gaillard ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler"
This reverts commit da77ce1029.
2013-03-14 17:01:16 +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 d3324ef6e8 // again remove additional \t 2013-03-14 16:58:28 +01:00
gRoussac 28285efb31 // again remove additional \t 2013-03-14 16:58:28 +01:00