dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,346 Commits 9 Branches 19 Tags
345d4cdbcf752c8d3e157da5a8a8a6d263a52cb7
Commit Graph

175 Commits

Author SHA1 Message Date
Gregory Roussac
4c399875d9 Merge pull request #737 from codeurWeb/patch-3 
[-] BO : fix postProcess override on AdminImportController
 2013-09-24 01:54:18 -07:00
Julien
6acebca8fa [-] BO : fix postProcess override on AdminImportController 
When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
 2013-09-23 21:04:55 +02:00
Julien
6850db0612 [-] BO : fix contructor override on AdminImportController 
When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
 2013-09-23 20:23:45 +02:00
gRoussac
0361d5db8d [-] BO : do not reaffect import_type for categories 2013-09-19 16:59:04 +02:00
gRoussac
803b6ce8ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	controllers/admin/AdminImportController.php
 2013-09-19 16:38:01 +02:00
gRoussac
0c511dead5 [*] FIX #PSCFV-8106 do not regenerate thumbnails if not 2013-09-19 16:28:19 +02:00
Rémi Gaillard
e7286c44f2 // typo 2013-09-18 18:08:22 +02:00
gRoussac
2e311410b2 [*] BO : Set import entity in cookie (#PSCFV-8214) 2013-09-18 17:02:00 +02:00
gRoussac
f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +02:00
Jerome Nadaud
da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes 2013-09-02 19:09:47 +02:00
Damien Metzger
496db1d13e // Added automatic smarty cache clearing after catalog import (csv) 2013-08-20 10:45:55 +02:00
Rémi Gaillard
4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
Dragan Skrbic
d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger
989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
François Gaillard
8bc725f4b6 // Release branch merged 2013-03-27 10:25:16 +01:00
Damien Metzger
155150ea00 [-] BO : fixed product indexation markup in import #PSCFV-7695 2013-03-20 10:43:18 +01:00
Damien Metzger
9ae5e0e12a // Code cleaning 2013-03-19 16:39:02 +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
Gregory Roussac
4c704c97c4 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
DrÿSs'
70bb7de9b5 [-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport 2013-03-15 16:51:55 +01:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Damien Metzger
d811f74d6c // Fixed fatal error 2013-02-18 16:17:05 +01:00
Damien Metzger
38cc7103fb // Fixed conversion commar/dot for floating value in CSV import 2013-02-05 18:09:32 +01:00
Damien Metzger
2df3e7ee8b // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +01:00
Damien Metzger
836791bb7a Merge pull request #218 from samy-r/development 
Disable search indexation
 2013-02-01 09:32:57 -08:00
Gregory Roussac
6d61b22a4f [-] BO : Fix warnings when importing #PSCFV-6648 again 2013-01-29 12:33:15 +01:00
Gregory Roussac
84005fea26 [-] Bo : Fix warnings #PSCFV-6648 2013-01-29 11:55:51 +01:00
Samy Rabih
8e80cdb6b7 Disable search indexation 
Search indexation is very CPU-intensive, it should not be used here
 2013-01-22 14:34:17 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
8d7196daf3 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
Damien Metzger
3d1663279a [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 2012-12-17 15:45:40 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard
c925f8f9fb [-] BO: Fix #PSCFV-4284 combinations import should delete available stock for combinations and not for products 2012-11-15 16:26:24 +00:00
vAugagneur
04df5fe3ab [-] BO : fixed bug #PSCFV-4274 - supplier reference missing in csv import of combinations 2012-10-31 15:30:58 +00:00
vAugagneur
5f15072eda [-] BO : fixed bug #PSCFV-5251 - unable deactivate product via CSV import 2012-10-25 16:40:03 +00:00
rGaillard
f38ef7b915 [-] Core: Fix cache issue and order slip pdf generation 2012-10-22 12:40:15 +00:00
lLefevre
462ef5e55d [-] BO : fix #PSCFV-5019 2012-10-17 09:31:27 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
221d32301a [-] BO : fix #PSCFV-4764 2012-10-16 13:57:17 +00:00
lLefevre
3c47a0a71c [-] BO : fix #PSCFV-5008 2012-10-16 13:14:14 +00:00
lLefevre
d570297658 [-] BO : fix #PSCFV-4988 2012-10-15 09:36:01 +00:00
lLefevre
0b349abb66 [-] BO : fix #PSCFV-4901 2012-10-11 09:02:17 +00:00
vAugagneur
b440b6ac14 [-] BO : fixed bug #PSCFV-4209 2012-10-10 09:48:13 +00:00
rGaillard
910b3916c4 [-] BO: Allow only one default combination per product when using import 2012-10-10 09:44:41 +00:00
lLefevre
98135572df [-] BO : fix #PSCFV-4607 2012-10-04 13:33:13 +00:00
lLefevre
f686c79473 [-] BO : fix #PSCFV-4672 2012-10-03 12:49:16 +00:00
lLefevre
af32a55fad [-] BO : fix #PSCFV-4626 2012-10-03 12:08:00 +00:00
lLefevre
4f6a1ee3c0 [-] BO : fix #PSCFV-4596 : added an option for to force the id during CSV import 2012-10-02 12:08:41 +00:00