gRoussac
|
d141f5bdc0
|
// wrong modif on ProductSale
|
2013-10-04 18:35:30 +02:00 |
|
gRoussac
|
c2bcc5baa1
|
[*] FO : TM home modules preparation
|
2013-10-04 18:32:31 +02:00 |
|
Fabio Chelly
|
48f20a4393
|
Merge remote-tracking branch 'origin/development' into development
|
2013-10-04 18:15:32 +02:00 |
|
Fabio Chelly
|
139a74e4cd
|
[*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly
|
2013-10-04 18:15:12 +02:00 |
|
Jerome Nadaud
|
2e4f5c0b07
|
// Menus details list is now bootstraped
|
2013-10-04 17:34:07 +02:00 |
|
Damien Metzger
|
337725bb86
|
// Fixed KPI with 0 value
|
2013-10-04 17:28:03 +02:00 |
|
Vincent Augagneur
|
5564b342f4
|
//wizard boostrap and title fix
|
2013-10-04 17:07:10 +02:00 |
|
Jerome Nadaud
|
121fcdc39f
|
// Fix list start
|
2013-10-04 16:56:35 +02:00 |
|
Vincent Augagneur
|
fe6494bf35
|
//fixed bug PSCFV-10567
|
2013-10-04 16:33:50 +02:00 |
|
Vincent Augagneur
|
828b838d22
|
//products comparison link
|
2013-10-04 16:25:47 +02:00 |
|
Jerome Nadaud
|
5557ac1aee
|
// Remove attribute language desc from stock movement list when product attribute is removed
|
2013-10-04 15:30:27 +02:00 |
|
Damien Metzger
|
5c5a989cda
|
// Added javascript validation functions (demo)
|
2013-10-04 15:24:50 +02:00 |
|
Rémi Gaillard
|
16dfa4e73d
|
// missing file
|
2013-10-04 15:12:08 +02:00 |
|
Jerome Nadaud
|
887b68d3f2
|
// Customers Groups View list resize
|
2013-10-04 14:24:33 +02:00 |
|
gRoussac
|
a4b7fc942f
|
[-] CORE : #PSCFV-10389 Avoid eventual empty Specific Price Rule
|
2013-10-04 14:11:42 +02:00 |
|
Rémi Gaillard
|
fef8d2beac
|
// Fix group reduction per category
|
2013-10-04 14:00:42 +02:00 |
|
Jerome Nadaud
|
5b203cf789
|
// Remove languages select when only one language
|
2013-10-04 13:51:38 +02:00 |
|
Rémi Gaillard
|
6dacc07e62
|
// sometimes, translations files could not exist
|
2013-10-04 13:19:34 +02:00 |
|
indesign47
|
805989da39
|
[-] BO : AdminImport add products available fields
|
2013-10-04 13:04:52 +02:00 |
|
Jerome Nadaud
|
9ae6546d90
|
// Features - Remove select language with one language and add autosize to textarea
|
2013-10-04 12:23:01 +02:00 |
|
Jerome Nadaud
|
093bf9e065
|
[-] MO : Blocklayered - Fix expand/collapse tree problem
|
2013-10-04 11:51:12 +02:00 |
|
indesign47
|
75cb92c329
|
Update AdminImportController.php
|
2013-10-04 11:44:52 +02:00 |
|
Gregory Roussac
|
f28131fe9b
|
Merge pull request #795 from indesign47/patch-3
[-] BO : AdminImport add combinations available fields
|
2013-10-04 02:40:29 -07:00 |
|
indesign47
|
96646b5c7a
|
[-] BO : AdminImport add products available fields
|
2013-10-04 10:56:41 +02:00 |
|
indesign47
|
a92ced814a
|
[-] BO : AdminImport add combinations available fields
|
2013-10-04 10:26:38 +02:00 |
|
 Jerome NadaudandgRoussac
|
3d8591c588
|
[-] MO : Blocklayered - Fix empty fancy box after template edit
|
2013-10-04 10:14:07 +02:00 |
|
Gregory Roussac
|
09ad15730b
|
Merge pull request #794 from indesign47/release
[-] BO : AdminImport add adresses required fields
|
2013-10-04 01:02:46 -07:00 |
|
indesign47
|
6c9b71ee58
|
[-] BO : AdminImport add adresses required fields
|
2013-10-04 04:35:00 +02:00 |
|
indesign47
|
0af24ab034
|
[-] BO : AdminImport add adresses required fields
|
2013-10-04 04:31:51 +02:00 |
|
Kevin Granger
|
bb7dd876af
|
// orders WIP
|
2013-10-03 21:04:35 +02:00 |
|
Rémi Gaillard
|
f100027e5d
|
[-] FO: packages should be splitted with advanced stock management when carrier is not associated to multiple warehouse
|
2013-10-03 19:21:49 +02:00 |
|
Jerome Nadaud
|
6a0c376a18
|
[-] MO : Blocklayered - Fix empty fancy box after template edit
|
2013-10-03 18:58:09 +02:00 |
|
gRoussac
|
62d946ea68
|
[-] CORE : Fix bug #PSCFV-10179 Duplicate specific price records when updating a product
|
2013-10-03 18:41:06 +02:00 |
|
gRoussac
|
31f421153d
|
[-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset
|
2013-10-03 18:20:45 +02:00 |
|
Jerome Nadaud
|
874e17aa6f
|
// remove javascript include from tpl
|
2013-10-03 17:55:30 +02:00 |
|
Jerome Nadaud
|
1dc07ab2ba
|
// Modules positions drag and drop
|
2013-10-03 17:49:24 +02:00 |
|
Jerome Nadaud
|
39f0284aa3
|
// Modules positions drag and drop for bootstrap
|
2013-10-03 17:47:09 +02:00 |
|
gRoussac
|
c75cda2429
|
[*] BO : AdminImport, retrieve separators and lang selected
|
2013-10-03 17:35:20 +02:00 |
|
Damien Metzger
|
e7c860a3dd
|
Merge pull request #792 from djfm/release
// remove backup files
|
2013-10-03 08:09:41 -07:00 |
|
djfm
|
8580dd0b39
|
// remove backup files
|
2013-10-03 15:02:16 +00:00 |
|
Damien Metzger
|
9e837d1ecc
|
// No more translation packs in the ZIP (except for FR and EN), only remotes!
|
2013-10-03 16:35:54 +02:00 |
|
Gregory Roussac
|
cfd70bf660
|
Merge pull request #789 from PhpMadman/patch-2
[*] BO: wrong description on getIdOrderCarrier
|
2013-10-03 07:30:14 -07:00 |
|
Rémi Gaillard
|
0662cd3b12
|
// don't need to clear smarty cache while installation
|
2013-10-03 16:29:31 +02:00 |
|
Damien Metzger
|
6c4a69ea0b
|
Merge pull request #790 from djfm/release
// added tab translations to Bengali installer
|
2013-10-03 07:26:29 -07:00 |
|
djfm
|
b92c9869a4
|
// added tab translations to Bengali installer
|
2013-10-03 14:20:08 +00:00 |
|
gRoussac
|
992cc6b437
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-10-03 16:10:37 +02:00 |
|
gRoussac
|
7f32e8d187
|
[-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot
|
2013-10-03 16:09:43 +02:00 |
|
gRoussac
|
cafe2ed9d2
|
[-] BO : Fix bug #PSCFV-10064, could not import deature in multilang, thanks @E.Bigfoot
|
2013-10-03 16:08:53 +02:00 |
|
PhpMadman
|
e38d808a85
|
[*] BO: wrong description on getIdOrderCarrier
|
2013-10-03 15:51:27 +02:00 |
|
Gregory Roussac
|
86631202df
|
Merge pull request #788 from PhpMadman/patch-1
[*] BO: missing align on order for product warehouse
|
2013-10-03 06:37:58 -07:00 |
|