 Jerome Nadaud
|
d88857610d
|
// Toolbar modifs
|
2013-10-08 18:42:07 +02:00 |
|
|
Damien Metzger
|
53748c3119
|
// Code cleaning
|
2013-10-08 15:01:46 +02: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 |
|
|
Damien Metzger
|
a14118863e
|
// Code cleaning
|
2013-10-08 14:45:21 +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 |
|
|
Francois Gaillard
|
77b2b4b6ca
|
// Manual merge PS 1.5.6.0
|
2013-10-07 18:22:55 +02:00 |
|
|
Jerome Nadaud
|
6f2358a0da
|
// Manufacturer view bootstraped
|
2013-10-07 14:16:41 +02:00 |
|
|
Jerome Nadaud
|
efb041b747
|
// New referer Bootstraped
|
2013-10-07 13:40:36 +02:00 |
|
|
Jerome Nadaud
|
6fc12968b8
|
// Fix missing module configuration bar #PSCSX-3
|
2013-10-07 12:03:37 +02:00 |
|
|
Kevin Granger
|
2c3bf85ca7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-07 11:12:59 +02:00 |
|
|
Kevin Granger
|
ba7d9eec21
|
// fix Orders
|
2013-10-07 11:11:21 +02:00 |
|
|
Jerome Nadaud
|
9b79a02e88
|
// Remove unused function
|
2013-10-07 11:03:42 +02:00 |
|
|
indesign47
|
b61e3e68b9
|
Update AdminImportController.php
|
2013-10-05 10:50:19 +02:00 |
|
|
Zollner Robert
|
1787923c4c
|
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase)
|
2013-10-05 00:42:29 +03:00 |
|
|
Zollner Robert
|
481cb5c28a
|
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
|
2013-10-04 23:30:24 +03:00 |
|
|
Kevin Granger
|
2ab3f08eab
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-04 19:13:13 +02:00 |
|
|
Kevin Granger
|
c2ea0be841
|
// orders WIP
|
2013-10-04 19:13:02 +02:00 |
|
|
Jerome Nadaud
|
2e4f5c0b07
|
// Menus details list is now bootstraped
|
2013-10-04 17:34:07 +02:00 |
|
|
Vincent Augagneur
|
5564b342f4
|
//wizard boostrap and title fix
|
2013-10-04 17:07:10 +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 |
|
|
Jerome Nadaud
|
887b68d3f2
|
// Customers Groups View list resize
|
2013-10-04 14:24:33 +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 |
|
|
indesign47
|
75cb92c329
|
Update AdminImportController.php
|
2013-10-04 11:44:52 +02:00 |
|
|
indesign47
|
96646b5c7a
|
[-] BO : AdminImport add products available fields
|
2013-10-04 10:56:41 +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 |
|
|
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 |
|
|
gRoussac
|
c75cda2429
|
[*] BO : AdminImport, retrieve separators and lang selected
|
2013-10-03 17:35:20 +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
|
8b2215eec5
|
// remove warning
|
2013-10-03 15:02:48 +02:00 |
|
|
gRoussac
|
0f288583ca
|
[-] BO : Remove dead code in AdminImport
|
2013-10-03 14:57:03 +02:00 |
|
|
Jerome Nadaud
|
309f4333a7
|
// Supply orders bootstraping
|
2013-10-03 14:13:15 +02:00 |
|
|
Jerome Nadaud
|
43a60f1b57
|
[-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses
|
2013-10-03 11:06:08 +02:00 |
|
|
Rémi Gaillard
|
e190c8df9f
|
// small fix on import
|
2013-10-03 10:33:43 +02:00 |
|
|
Damien Metzger
|
e82f0feacf
|
// Fixed customer tab
|
2013-10-03 09:52:25 +02:00 |
|
|
Jerome Nadaud
|
90b203fde3
|
// Stock instant bootstraping
|
2013-10-02 18:59:34 +02:00 |
|
|
Jerome Nadaud
|
75771e0723
|
// Supply order bootstraping
|
2013-10-02 18:59:21 +02:00 |
|
|
Jerome Nadaud
|
f891f64cc4
|
// Stock cover bootstraping
|
2013-10-02 18:58:47 +02:00 |
|
|
gRoussac
|
e9a3c98af9
|
[-] BO : Fix bug #PSCFV-8389 duplicates is SpecificPrice table
|
2013-10-02 18:57:45 +02:00 |
|
|
Damien Metzger
|
3cfe76ec0c
|
// Fixed mean age
|
2013-10-02 18:10:51 +02:00 |
|
|
gRoussac
|
da48cea96e
|
[-] BO : AdminImport, tables are not truncated
|
2013-10-02 17:54:48 +02:00 |
|
|
Jerome Nadaud
|
dc06ef9c6d
|
// Stock movement fix export button on select filter
|
2013-10-02 17:09:31 +02:00 |
|
|
Jerome Nadaud
|
f63e1065b3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-02 16:58:37 +02:00 |
|
|
Jerome Nadaud
|
04e5617d7d
|
// Instant stock bootstraping
|
2013-10-02 16:58:27 +02:00 |
|
|
Sarah Lorenzini
|
791481e149
|
// update login page
|
2013-10-02 16:00:54 +02:00 |
|
|
gRoussac
|
bf6a0e0077
|
[-] BO : Fix bug #PSCFV-5060 could not import supplier_combinations in combinations import
|
2013-10-02 15:46:11 +02:00 |
|
|
Jerome Nadaud
|
acb5bf77f6
|
// Remove comment
|
2013-10-02 14:52:13 +02:00 |
|