dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,801 Commits 9 Branches 19 Tags
f58526c70112f99b83ae1b93edccbbfe526580ce
Commit Graph
18801 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fchellypresta 075a911cee Merge pull request #830 from indesign47/patch-5 
[-] MO : productcomments errors translated in multi-language
 2013-10-11 00:40:32 -07:00
fchellypresta 6f878353a6 Merge pull request #831 from indesign47/patch-7 
[-] MO : productcomments round average up not down
 2013-10-11 00:29:37 -07:00
djfm bb96c8754f [*] LO : set correct currency format for CHF 2013-10-11 07:14:30 +00:00
gRoussac dc1632a8b0 [-] BO : Adminimport, id_specific key_price not defined 2013-10-10 22:04:42 +02:00
Gregory Roussac a87bbf84b4 Merge pull request #825 from indesign47/patch-4 
[-] BO : AdminImport add available fields to Products
 2013-10-10 10:22:43 -07:00
Damien Metzger 4505387046 // Try to fix regexp issues with some PHP configurations 2013-10-10 18:41:50 +02:00
gRoussac 286084c42d Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master 
Conflicts:
	controllers/admin/AdminImportController.php
 2013-10-10 17:06:13 +02:00
Jerome Nadaud 789911184b [-] BO : FixBug - Remove second email in recipient 2013-10-10 15:04:32 +02:00
gRoussac 39a543188a [-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT 2013-10-10 14:54:12 +02:00
Damien Metzger 9bae53a4d9 Merge pull request #828 from djfm/development 
// fixed name of gender 2 in English
 2013-10-10 03:08:40 -07:00
djfm 819dac6622 // fixed name of gender 2 in English 2013-10-10 09:36:05 +00:00
François Gaillard 8d1bca5542 Merge pull request #768 from enumag/patch-4 
[-] Classes : Hook - Display payment method & custommer currency bug fix
 2013-10-09 13:52:09 -07:00
Fabio Chelly 246340b78c [*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned) 2013-10-09 18:33:41 +02:00
Fabio Chelly 75ffa8c4f8 [*] BO Module search: Enter key is now disabled in quick search field 2013-10-09 18:30:09 +02:00
Jerome Nadaud f6bbb6e241 // Fix duplicate invoice delivery number 2013-10-09 17:43:43 +02:00
Jerome Nadaud 68d84892c7 // remove self:: 2013-10-09 16:40:09 +02:00
Jerome Nadaud 2feb5dd8d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-09 16:31:09 +02:00
Jerome Nadaud d0a4636966 [-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number 2013-10-09 16:29:15 +02:00
Vincent Augagneur d796d0012e [-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier 2013-10-09 15:25:02 +02:00
Gregory Roussac df4ae671a2 Merge pull request #826 from gouz/patch-4 
[-] BO : Export DeliverySlip, the dates range using delivery_date but date_add
 2013-10-09 06:02:52 -07:00
gRoussac df97566018 [-] BO : AdminImport no default value for separators 2013-10-09 13:57:36 +02:00
gRoussac 338efcad7f [-] CORE : $smarty->compile_check is not set to false, thanks @prestamodule 2013-10-09 12:14:49 +02:00
Sylvain Gougouzian 7a6dea4964 [~] BO : Export DeliverySlip 
The dates range wasn't using the correct sql fields.
 2013-10-09 10:39:24 +02:00
gRoussac 008c6ce759 [-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing 2013-10-08 18:37:50 +02:00
gRoussac 85946bacbe // small cast 2013-10-08 18:35:56 +02:00
Gregory Roussac cd8af9ae67 Merge pull request #824 from Prestaworks/patch-14 
[-] BO : Fixes issue where path is not printed when error with email template saves occur.
 2013-10-08 05:57:21 -07:00
Daniel fa88a0bd93 Update AdminTranslationsController.php 
Fixes issue where path is not printed when error with email template saves occur.
 2013-10-08 20:54:52 +08:00
Rémi Gaillard 2899dfba5e // Fix AdminTranslationsController::addNewTabs() 2013-10-08 14:53:02 +02:00
Krystian Podemski ae7d33effe [*] CORE: Add phone_mobile to address format 
I honestly do not know why you decided by default to show only the first field of the phone :)

Users often ask me why they don't see their mobile phone on orders in BO.
 2013-10-08 11:11:24 +02:00
gRoussac e4a642128a [-] FO : Fix bug #PSCFV-10606 could not have correct taxCalculationMethod when vat number in customer address 2013-10-08 11:09:52 +02:00
Zollner Robert 30adb0932d [-] BO : pass correct typed parameter to setCurrency 2013-10-07 23:42:26 +03:00
Rémi Gaillard 7d0e9a5f06 // Fix double entities on AdminLog listing #PSCFV-10472 2013-10-07 19:37:58 +02:00
Gregory Roussac 4daaa206d2 Merge pull request #818 from cedricfontaine/patch-2 
[-] MO : Price should apply tax as in configuration.
 2013-10-07 09:55:35 -07:00
Gregory Roussac 644e38c05f Merge pull request #817 from cedricfontaine/patch-1 
[-] MO :Loyalty voucher should be without taxes, otherwise points would be negative.
 2013-10-07 09:54:22 -07:00
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
cedricfontaine d63288affd Update loyalty.php 
Price should apply tax as in configuration.
 2013-10-07 12:14:13 -04:00
Damien Metzger c51fe5b22d // Changelog 1.5.6.0 1.5.6.0 2013-10-07 18:07:25 +02:00
cedricfontaine 717e195f57 Update LoyaltyModule.php 
Voucher should be without taxes, otherwise points would be negative.
 2013-10-07 12:07:03 -04:00
Gregory Roussac f78a093a1c Merge pull request #815 from PrestanceDesign/development 
[*] TR : Italian translation of the country instead of English
 2013-10-07 08:39:39 -07:00
PrestanceDesign f9f5a4b090 Italian translation of the country instead of English 2013-10-07 16:45:22 +02:00
Gregory Roussac 92ffb1eab1 Merge pull request #812 from djfm/release 
[*] TR : updated Russian installer
 2013-10-07 03:25:42 -07:00
Francois Gaillard f4610c06e0 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:21:16 +02:00
Francois Gaillard 68cba08303 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:18:44 +02:00
djfm 2969a7f74c // updated Russian installer 2013-10-07 10:14:43 +00:00
Rémi Gaillard 1ed26e2d4e // default perms profiles 2013-10-07 12:13:59 +02:00
gRoussac 302260539b // Report from https://github.com/Lupul/PrestaShop/commit/ebf09792e95598c30d8ac2617c4eabdd571be475 2013-10-07 12:08:39 +02:00
gRoussac d125ca0a36 [-] FO : isVirtualCart was forced to false 2013-10-07 12:06:28 +02:00
gRoussac adb1779764 [-] FO : isVirtualCart was forced to false 2013-10-07 12:02:47 +02:00
Fabio Chelly a652590885 Merge remote-tracking branch 'origin/development' into development 2013-10-07 11:34:56 +02:00
Fabio Chelly 2515d81bdd [*] BO Module search: Quick search can now search modules by name and not only display name 2013-10-07 11:34:16 +02:00