gRoussac
d4b39184a0
// AdminCarts order way DESC
2013-12-08 16:39:41 +01:00
djfm
6419f6a7ad
// fixed bug with ordering of JS files in AdminImport
2013-12-06 15:47:29 +00:00
Vincent Augagneur
669a49be59
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 10:17:12 +01:00
Vincent Augagneur
c2e0edcc7a
[-] BO : carrier wizard no fees display
2013-12-06 10:17:07 +01:00
rGaillard
5e18a94d2a
// employee avatar on the logs listing
2013-12-05 19:16:43 +01:00
PhpMadman
9df713e6ec
[-] BO : Fixes for Advanced Stock Management Import
...
[*] BO : Combinations import supports Advanced Stock Management
[*] BO : Advanced Stock Management import now supports stock increase
[*] BO : Advanced Stock Management stock unit price uses wholesale_price (Product Cost) or 0.00001 if not set
[*] BO : Added Advanced Stock Management to csv import docs
2013-12-05 12:30:17 +01:00
gRoussac
3889f6d61f
// follow up 7140a63272 (commitcomment-4775950)
2013-12-05 11:27:07 +01:00
gRoussac
ec8ca92e67
// norms
2013-12-04 18:49:34 +01:00
gRoussac
7140a63272
Merge branch '1.6-CSVAdvanced' of https://github.com/PhpMadman/PrestaShop into PhpMadman-1.6-CSVAdvanced
2013-12-04 18:39:33 +01:00
gRoussac
96fd3f3d32
[+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570
2013-12-04 17:41:10 +01:00
gRoussac
f6fed64472
[*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636
2013-12-04 12:14:51 +01:00
Damien Metzger
b657115552
// Fixed bad entities in KPI
2013-12-03 18:12:02 +01:00
Lucas CERDAN
da2d48890f
Merge pull request #1072 from PhpMadman/Boot-AutoSeoUrl
...
[*] BO : Option to always rewrite friendly url of product
2013-12-03 06:15:28 -08:00
Gregory Roussac
22c09ac367
Merge pull request #1073 from studiokiwik/sk-ps15x-012
...
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 05:51:27 -08:00
Mikael Blotin
d81e81e4f3
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 14:42:14 +01:00
Vincent Augagneur
a9f2bd053a
[-] BO : carrier wizard fixed when select zone and set no shipping fees
2013-12-03 11:45:43 +01:00
rGaillard
8a72e4d810
// small fix
2013-12-03 11:18:58 +01:00
PhpMadman
0de9c3ac6c
[*] BO : Added option to always rewrite friendly url of product
2013-12-03 10:57:25 +01:00
Damien Metzger
2316bb50ba
// Fixed import button in AdminImport
2013-12-02 18:53:51 +01:00
Damien Metzger
7cd38d4461
// Changed base64 to urlencode in import (and fixed filename issue)
2013-11-29 19:24:04 +01:00
Jerome Nadaud
53b327ec46
// small fix
2013-11-29 18:32:05 +01:00
gRoussac
f39b621251
[-] BO : Fix bug #PSCFV-11162 AdminImport, Exception on ProductSupplier
2013-11-29 18:29:50 +01:00
Jerome Nadaud
8dae23891a
// Remove add category on edit
2013-11-29 18:08:01 +01:00
Jerome Nadaud
fbf2c26093
// Fix when file is missing
2013-11-29 18:07:50 +01:00
Damien Metzger
e0b28dd57b
// AdminOutstanding is now bootstraped
2013-11-29 17:10:22 +01:00
Jerome Nadaud
6da40e7159
// fix new tax rule button
2013-11-29 16:54:33 +01:00
Jerome Nadaud
8ad3166226
// Add save button to Localization tax rules
2013-11-29 15:30:57 +01:00
Jerome Nadaud
4c2500fb35
// Remove unnecessary code
2013-11-29 14:35:06 +01:00
Jerome Nadaud
e1568a67a2
// Fix products attachments uploader
2013-11-29 12:10:09 +01:00
Kevin Granger
1d2f6c9b9d
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-28 19:22:03 +01:00
Kevin Granger
0f74646524
// import
2013-11-28 19:21:55 +01:00
Jerome Nadaud
9e6868ba97
// Change product attachment upload system
2013-11-28 19:09:24 +01:00
Jerome Nadaud
7261490381
// Fix Categories image problem
2013-11-28 15:35:17 +01:00
Damien Metzger
35fc864e0b
// Fixed potential warning
2013-11-28 14:29:40 +01:00
gRoussac
cb9d00352f
[-] BO : Adminimport reset selected csv if not exists
2013-11-28 14:19:23 +01:00
Jerome Nadaud
37afb369c3
// Fix already defined Core class
2013-11-28 11:46:32 +01:00
Vincent Augagneur
dde8540a86
//carrier wizard logo location fixed
2013-11-28 11:27:34 +01:00
gRoussac
8370c18fe8
[-] CORE : Remove notices on ob clean
2013-11-28 11:11:49 +01:00
Kevin Granger
cc3a1379d1
// Import WIP (still broken for first upload)
2013-11-27 19:33:36 +01:00
Jerome Nadaud
76f115ac22
// Small Fix in Import controller
2013-11-27 18:12:45 +01:00
Jerome Nadaud
17294618e1
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-27 17:57:31 +01:00
Jerome Nadaud
724d52e019
// Adding timestamp filename to csv import
2013-11-27 17:57:19 +01:00
Damien Metzger
8c4e2a9a93
// Removed useless lines
2013-11-27 17:40:35 +01:00
Jerome Nadaud
b58e8b6bb7
// One step csv uploader
2013-11-27 16:35:58 +01:00
Jerome Nadaud
cc8f4696b1
// Small Fix in product image upload
2013-11-27 15:56:15 +01:00
gRoussac
5485433df6
[-] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/819
2013-11-26 22:57:57 +01:00
rGaillard
58eb63e99e
// small fix
2013-11-26 17:02:13 +01:00
Jerome Nadaud
dc90bb6227
// Force clearstatcache on product image upload
2013-11-26 15:46:21 +01:00
Gregory Roussac
841f6ec65d
Merge pull request #1011 from indesign47/patch-10
...
[+] BO : AdminSearchConf add import alias
2013-11-26 02:35:30 -08:00
Damien Metzger
9ad56871de
Merge pull request #1004 from djfm/bootstrap
...
// when adding a translation pack, do not install translations for modules that are not on the disk
2013-11-26 01:31:24 -08:00
