Jerome Nadaud
72a7ac2d03
// Special external link in warehouse view
2013-09-24 17:19:01 +02:00
Jerome Nadaud
0247550a0a
// Fix accordion for bootsrap and better bulk action for warehouse
2013-09-24 17:18:37 +02:00
Rémi Gaillard
beb0a74135
// use ObjectModel::validateField on validaterules
2013-09-24 17:12:28 +02:00
Jerome Nadaud
a175e603ef
// Wharehouse view bootstrap fix
2013-09-24 16:20:05 +02:00
Jerome Nadaud
479662aa10
// Fix missing table id for shop asso in helper
2013-09-24 16:19:38 +02:00
Jerome Nadaud
003ba20238
// Products multistore bootstrap fix
2013-09-24 16:19:00 +02:00
gRoussac
3d477c62eb
// remove notice
2013-09-24 16:03:39 +02:00
Damien Metzger
d26336aa77
// Copy KPIs from customer to cart
2013-09-24 15:54:45 +02:00
Damien Metzger
799efcba3f
[*] BO : Customers KPIs
2013-09-24 15:32:05 +02:00
Vincent Augagneur
a913a43b17
//mailalerts now use bootstrap design
2013-09-24 14:49:56 +02:00
Jerome Nadaud
00ddfeba05
// CMS select size in form
2013-09-24 13:09:22 +02:00
Jerome Nadaud
c9eb5b5be6
// Products multistore design
2013-09-24 12:29:12 +02:00
Jerome Nadaud
6e2337df44
// Add id attribute to tree header button
2013-09-24 12:27:51 +02:00
Damien Metzger
8f08f67812
[+] BO : Added fees configuration for the dashboard
2013-09-24 12:22:40 +02:00
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
Gregory Roussac
92b987c0f8
Merge pull request #736 from codeurWeb/patch-2
...
[-] BO : fix ovverride of constructor when PS_ADVANCED_STOCK_MANAGEMENT is off
2013-09-24 01:40:16 -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
Jerome Nadaud
18a621e022
// Multistore invisible description in options
2013-09-23 19:02:22 +02:00
Jerome Nadaud
f04126c436
// Customers groups - Add special tree handle for categories tree
2013-09-23 18:16:47 +02:00
Jerome Nadaud
c78c8b04bd
// Multistore checkbox js functions
2013-09-23 18:05:16 +02:00
Jerome Nadaud
69f97baa6a
// Search conf list size
2013-09-23 18:04:48 +02:00
Jerome Nadaud
202c6fe463
// Carrier list size
2013-09-23 18:04:18 +02:00
Jerome Nadaud
320e1512df
// Multistore checkbox design
2013-09-23 18:03:32 +02:00
Damien Metzger
6796b64e18
Merge pull request #691 from djfm/development
...
// fixed translation of modules descriptions containing quotes
2013-09-23 07:51:57 -07:00
Vincent Augagneur
0b35c5506c
//crossselling module now use boostrap design
2013-09-23 15:22:42 +02:00
Vincent Augagneur
a2d770e04f
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-23 15:10:49 +02:00
Vincent Augagneur
642ff59bef
//cheque module now use boostrap design
2013-09-23 15:10:46 +02:00
Damien Metzger
590e738254
// Fixed typo
2013-09-23 14:40:25 +02:00
Vincent Augagneur
e8420f24d1
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-23 14:19:12 +02:00
Jerome Nadaud
e128e17f4e
// Geoloc bootstrap design
2013-09-23 14:04:15 +02:00
Jerome Nadaud
748d6271a9
// Stores controller bootstrap
2013-09-23 13:56:30 +02:00
Jerome Nadaud
234b6de1b0
// Stores controller bootstrap design
2013-09-23 13:31:45 +02:00
Jerome Nadaud
4bb0a5f794
// Preferences images bootstrap design
2013-09-23 11:43:31 +02:00
Rémi Gaillard
c6222c51c8
// commit 6b47f5713e is missing
2013-09-23 11:36:15 +02:00
Fabio Chelly
a1555c3fc8
Merge remote-tracking branch 'origin/development' into development
2013-09-23 11:24:26 +02:00
Fabio Chelly
31697fde3c
[-] MO productcomments: confirmation message takes moderation mode into account
2013-09-23 11:24:14 +02:00
Jerome Nadaud
5206496f64
[-] BO : Fix Bug For new Fancy Box events
2013-09-23 11:22:51 +02:00
Jerome Nadaud
cf82157d47
// oops
2013-09-23 10:48:56 +02:00
Jerome Nadaud
7dbb6088a4
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-23 10:42:30 +02:00
Rémi Gaillard
50bbf1a547
// small fix
2013-09-23 10:46:41 +02:00
Jerome Nadaud
32a7a28567
[-] MO : FixBug #PNM-1683 - Treeview problem
2013-09-23 10:42:10 +02:00
Vincent Augagneur
12f67a825b
//carriercompare now use bootstrap design
2013-09-23 10:24:26 +02:00
Rémi Gaillard
a578cfb2e2
[-] FO: Fix #PSCFV-10461
2013-09-23 10:20:22 +02:00
Jerome Nadaud
f4e0f63ef7
// Add lingerie to activities list
2013-09-23 10:14:23 +02:00
Jerome Nadaud
45c7cb7757
// Cms categories list
2013-09-23 10:13:45 +02:00
Vincent Augagneur
39d84759a3
//blockviewed now use boostrap design
2013-09-23 10:06:43 +02:00
Vincent Augagneur
0fa8b4305e
//blocktags now use boostrap design
2013-09-23 10:03:28 +02:00
Vincent Augagneur
6e24fe1411
//blocksupplier now use bootstrap design
2013-09-23 09:52:58 +02:00
gRoussac
39468476ab
[-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a
2013-09-23 09:50:12 +02:00