dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,367 Commits 9 Branches 19 Tags
e48b2a411ea882eefcbbd4e871862b82e669eecf
Commit Graph

3592 Commits

Author SHA1 Message Date
Gregory Roussac f6ef6f5d0e Merge pull request #572 from PrestaEdit/patch-47 
[-] Class : Media / Correct jquery_ui_dependencies fileName
 2013-07-15 07:41:07 -07:00
gRoussac 01bad90b29 // Welcome 2013 2013-07-15 16:36:54 +02:00
PrestaEdit 4b8a756add [-] Class: Media / Correct jquery_ui_dependencies fileName 
Even if not used...
 2013-07-15 16:34:51 +02:00
Rémi Gaillard ee1187d821 [-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query 2013-07-15 11:00:35 +02:00
Rémi Gaillard e23854d143 // Add currency ID on default modules cache id 2013-07-12 17:49:38 +02:00
Gregory Roussac 39a23e1494 Merge pull request #560 from BigZ/patch-4 
[-] PDF : Develivery slip should use prefix
 2013-07-12 08:42:16 -07:00
Gregory Roussac b25b88cf33 Merge pull request #559 from BigZ/patch-3 
[-] PDF : Invoice prefix wasn't used in filename
 2013-07-12 08:41:37 -07:00
Gregory Roussac 105b1422a3 Merge pull request #562 from axometeam/patch-14 
[*] BO : Do not increment stock if statut change fom Error to Canceled
 2013-07-12 07:22:50 -07:00
gRoussac 8588978e03 [*] FO : getCatImageLink doesn't work without type thanks @axometeam 2013-07-12 15:03:52 +02:00
Axome 1c960da57a [*] BO : Not increment stock if statut change fom Error to Canceled 
Not increment stock if statut change fom Error => Canceled or Canceled => Error (stock should stay the same).
Add a code simplification too
 2013-07-12 11:22:42 +02:00
Rémi Gaillard 0928efb112 // small fix 2013-07-12 11:17:30 +02:00
Gregory Roussac c3b7e1dad9 Merge pull request #519 from axometeam/patch-5 
[*] BO : Correct Request Sql Manager validate options
 2013-07-12 02:08:45 -07:00
Gregory Roussac 44debd682f Merge pull request #517 from axometeam/patch-4 
[*] BO : AdminControllers Keep "active" filter on pagination
 2013-07-12 02:07:51 -07:00
Rémi Gaillard 4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
Gregory Roussac 8fcca7999d Merge pull request #502 from axometeam/patch-2 
[-] BO : Prevent false error for product duplication
 2013-07-12 01:29:39 -07:00
BigZ 25b5d2857b develivery slip should use prefix 
as develivery_prefix uses lang and shop id, those variables has to be passed as parameters
 2013-07-12 03:03:21 +02:00
BigZ e28a1e793a Invoice prefix wasn't used in filename 
As invoice_prefix uses lang and shop ids they have to be passed has parameters
 2013-07-12 03:01:33 +02:00
gRoussac a5ee2c2f4f [-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab 2013-07-11 18:27:54 +02:00
Rémi Gaillard d0cf8fce18 // small fix 2013-07-11 17:04:29 +02:00
Rémi Gaillard 20b5449231 [*] Core: that is now easier to get links for another shop 2013-07-11 16:40:40 +02:00
Rémi Gaillard 004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
Francois Gaillard d0e4e956c4 [-] Classes : Mail - check instance of link in the context 2013-07-11 14:01:24 +02:00
Damien Metzger 7cc5196fec [-] FO : fixed useless error when the product id in the URL is not an int #PSCFV-9726 2013-07-11 11:38:57 +02:00
Corentin Delcourt 02faf9d18e [-] WS: do not escape shop name overzealously 2013-07-10 10:21:33 +02:00
gRoussac e8b8fa0527 [-] CORE: No category in url preview on BO product page 2013-07-09 18:06:02 +02:00
Rémi Gaillard 7b62144220 [-] Core: ObjectModel::toggleStatus should change only active field on multishop with global context #PSCFV-9707 2013-07-09 11:19:58 +02:00
Damien Metzger bfa82c9648 [-] FO : you cannot access the front office with a disabled language anymore #PSCFV-9714 2013-07-09 10:59:25 +02:00
Damien Metzger 00425a4c1a [-] FO : fixed bad condition in the dispatcher rules 2013-07-09 10:52:50 +02:00
Damien Metzger c0c6c10bba [-] IN : fixed local install without connection #PSCFV-9286 #PSCFV-9709 2013-07-09 10:21:22 +02:00
Rémi Gaillard 18b247be94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-08 16:07:43 +02:00
Rémi Gaillard f413d9e6e6 [-] Core: Fix #PSCFV-9652 too much payments for multishipping orders 2013-07-08 16:07:20 +02:00
Damien Metzger 1bdc07be20 [*] FO : removed code specific to multishipping from the no-multishipping process 2013-07-08 11:21:50 +02:00
Damien Metzger 62ff976d69 // Removed redundant function calls 2013-07-05 14:25:22 +02:00
Damien Metzger 47d343df90 // Fixed module positions in tabs 2013-07-04 09:33:43 +02:00
Damien Metzger ae03669541 // Added the possibility to sort the modules in the tabs 2013-07-03 17:50:24 +02:00
Damien Metzger ec981b7f86 [*] WS : improved performances 2013-07-03 17:03:33 +02:00
Damien Metzger afda9cdd94 // Small fix 2013-07-03 15:05:22 +02:00
Francois Gaillard 8d3f330b2d [-] IN : Fixed bug with database creation 2013-07-03 12:19:34 +02:00
Damien Metzger 5789e6eb51 [*] IN : only display the button to create the database if you can actually create the database 2013-07-03 11:28:55 +02:00
Damien Metzger bfa2f33c65 [*] IN : the installer can now attempt to create the database for you 2013-07-03 11:04:34 +02:00
Damien Metzger c60c3da6a1 [*] WS : improved web service performances 2013-07-02 17:46:11 +02:00
Rémi Gaillard 6b71ec8b09 [-] BO: product supplier price should not be converted on product page #PSCFV-9420 2013-07-02 15:45:12 +02:00
Damien Metzger 854c16997c [*] FO : improved entity links retrieval (no need to instanciate an object when there is no need... to instanciate un object) 2013-07-02 15:08:56 +02:00
Damien Metzger 25dc4e25ac // Code cleaning 2013-07-02 11:48:48 +02:00
gRoussac 312dabbc60 //parse error 2013-07-02 00:30:50 +02:00
gRoussac 6e3a2449e8 [-] INSTALLER : Fix SQL warnings when upgrading 2013-07-01 23:39:00 +02:00
gRoussac 508cc0bd1a [-) CORE : Remove undefined constant in class declaration 2013-07-01 19:17:54 +02:00
Rémi Gaillard c5fc26ed0b // same for unregister hook 2013-07-01 16:30:53 +02:00
Rémi Gaillard 09359d011f [-] MO: exec hook on hook registration #PSCFV-8977 2013-07-01 16:12:33 +02:00
Damien Metzger d656297884 // Removed call to a deprecated file 2013-07-01 14:00:01 +02:00