 Kevin Granger
|
c2ea0be841
|
// orders WIP
|
2013-10-04 19:13:02 +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 |
|
|
Damien Metzger
|
337725bb86
|
// Fixed KPI with 0 value
|
2013-10-04 17:28:03 +02:00 |
|
|
Jerome Nadaud
|
5b203cf789
|
// Remove languages select when only one language
|
2013-10-04 13:51:38 +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 |
|
|
Kevin Granger
|
bb7dd876af
|
// orders WIP
|
2013-10-03 21:04:35 +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 |
|
|
PhpMadman
|
f979cbef57
|
[*] BO: missing align on order for product warehouse
|
2013-10-03 15:26:09 +02:00 |
|
|
Jerome Nadaud
|
6059ad163b
|
// Fix supply order state change save button
|
2013-10-03 11:51:08 +02:00 |
|
|
Jerome Nadaud
|
3585bf33c8
|
// Fix supply order change state save button
|
2013-10-03 11:49:16 +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 |
|
|
Jerome Nadaud
|
89d86793b0
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-10-03 09:12:01 +02:00 |
|
|
Jerome Nadaud
|
33b5971a7a
|
[-] BO : FixBug #PSCFV-10558 - Invalid HTML markup.
|
2013-10-03 09:11:26 +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 |
|
|
Jerome Nadaud
|
b472aaed96
|
// Fix Stock Cover select submit
|
2013-10-02 17:53:56 +02:00 |
|
|
Kevin Granger
|
19af1cfda5
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-02 17:39:03 +02:00 |
|
|
Kevin Granger
|
f168dd7c50
|
// list icon backward compat
|
2013-10-02 17:38:53 +02:00 |
|
|
Jerome Nadaud
|
dc06ef9c6d
|
// Stock movement fix export button on select filter
|
2013-10-02 17:09:31 +02:00 |
|
|
Jerome Nadaud
|
81b9c01824
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-02 17:08:39 +02:00 |
|
|
Jerome Nadaud
|
7454d75fb9
|
// List simple header bootstraping
|
2013-10-02 17:08:28 +02:00 |
|
|
Damien Metzger
|
84a251a575
|
[*] BO : you can noww override header and footer for each controller
|
2013-10-02 17:04:18 +02:00 |
|
|
gRoussac
|
a027dbd061
|
[*] BO : Add category id in AdminSpecificPriceRule
|
2013-10-02 17:00:20 +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
|
5993c188c5
|
// update login page
|
2013-10-02 16:50:09 +02:00 |
|
|
Sarah Lorenzini
|
791481e149
|
// update login page
|
2013-10-02 16:00:54 +02:00 |
|
|
Damien Metzger
|
250a9f17a2
|
[-] BO : managed decimal format in BO orders
|
2013-10-02 15:47:21 +02:00 |
|
|
Jerome Nadaud
|
68c5318706
|
// Icon change for list details button
|
2013-10-02 14:49:42 +02:00 |
|
|
Jerome Nadaud
|
3ce163449e
|
// Advanced stock management bootstraping
|
2013-10-02 14:48:23 +02:00 |
|
|
Sarah Lorenzini
|
1cb7f27a21
|
// update login page bootsrap
|
2013-10-02 14:38:13 +02:00 |
|
|
Sarah Lorenzini
|
ba06b217cc
|
// update javascript login page
|
2013-10-02 14:36:14 +02:00 |
|
|
Jerome Nadaud
|
661e18916b
|
// Permission bootstrap design
|
2013-10-02 12:30:07 +02:00 |
|
|
Jerome Nadaud
|
51c1ee0cf0
|
// Move ajax box and ajax confirmation to content part
|
2013-10-02 12:23:10 +02:00 |
|
|
Damien Metzger
|
a876b13c1c
|
[-] BO : fixed currency format on order creation
|
2013-10-02 12:10:54 +02:00 |
|
|
Jerome Nadaud
|
a891c9277a
|
// Advanced stock management details list
|
2013-10-02 12:09:03 +02:00 |
|
|
Jerome Nadaud
|
43c874e06e
|
// Fix line feed on address observation
|
2013-10-02 09:59:14 +02:00 |
|
|
Jerome Nadaud
|
ba2494fa8b
|
// Remove language select on textarea with 1 langue
|
2013-10-02 09:43:24 +02:00 |
|
|
Kevin Granger
|
65fc1fea63
|
// orders WIP
|
2013-10-01 18:50:41 +02:00 |
|
|
Jerome Nadaud
|
301de7a3a1
|
// Webservice and advanced stock list bootstraping
|
2013-10-01 18:29:35 +02:00 |
|
|
Jerome Nadaud
|
9c40dbb222
|
// Fix group view for bootstrap - removing limit restriction 'cause is now fixed
|
2013-10-01 17:00:56 +02:00 |
|
|
Jerome Nadaud
|
99a4ffe583
|
// Fix enable friendly url button generator on multishop
|
2013-10-01 16:44:03 +02:00 |
|
|
Jerome Nadaud
|
55a5c69d40
|
// Remove language select on only one language
|
2013-10-01 16:03:34 +02:00 |
|
|
Jerome Nadaud
|
bc8e972dfa
|
// Fix language id in features and quantities
|
2013-10-01 15:32:13 +02:00 |
|
|
Jerome Nadaud
|
759a3e191a
|
// Groups and language bootsrapify
|
2013-10-01 15:14:46 +02:00 |
|
|
Jerome Nadaud
|
14b584fc01
|
// Remove language select if exist only 1 language
|
2013-10-01 14:36:48 +02:00 |
|