Commit Graph
20949 Commits
Author SHA1 Message Date
Fabio Chelly 75ffa8c4f8 [*] BO Module search: Enter key is now disabled in quick search field 2013-10-09 18:30:09 +02:00
Damien Metzger 1939b8026b // CSS fix 2013-10-09 18:06:53 +02:00
Kevin Granger 84711bc386 // added .process-icon-save-and-preview 2013-10-09 17:57:02 +02:00
Jerome Nadaud f6bbb6e241 // Fix duplicate invoice delivery number 2013-10-09 17:43:43 +02:00
Kevin Granger 2c7ed00b39 // pagination 2013-10-09 17:21:53 +02:00
Rémi Gaillard fee92eecdd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 16:58:13 +02:00
Rémi Gaillard edddac8a0c // add colors on some controllers 2013-10-09 16:47:47 +02:00
Damien Metzger 9b24cca088 // Fixed category breadcrumb 2013-10-09 16:44:58 +02:00
Jerome Nadaud eadbefedae Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 16:42:44 +02:00
Jerome Nadaud e1ff774fcd // Restoring toolbar.tpl file for retrocompatibility 2013-10-09 16:42:13 +02:00
Jerome Nadaud 68d84892c7 // remove self:: 2013-10-09 16:40:09 +02:00
Jerome Nadaud 2feb5dd8d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-09 16:31:09 +02:00
Jerome Nadaud d0a4636966 [-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number 2013-10-09 16:29:15 +02:00
Vincent Augagneur 477973a43e //carrier wizard button good place and order 2013-10-09 16:24:25 +02:00
Damien Metzger e7d7e2f1ab // Fixed CSS hover on KPIs 2013-10-09 15:46:06 +02:00
Damien Metzger 1870dd4dd2 // Added order state color in order::getHistory() 2013-10-09 15:33:46 +02:00
Vincent Augagneur d796d0012e [-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier 2013-10-09 15:25:02 +02:00
Jerome Nadaud c8347cbc59 // Restore save button on header toolbar 2013-10-09 15:24:19 +02:00
Jerome Nadaud f5452aea66 // Products fix 2013-10-09 15:23:44 +02:00
Jerome Nadaud 61f3c61e2a // Some fix 2013-10-09 15:22:27 +02:00
Jerome Nadaud 81677cff44 // Toolbar improvement 2013-10-09 15:18:54 +02:00
Damien Metzger a2371067bf // CSS fixes 2013-10-09 15:11:04 +02:00
Gregory Roussac df4ae671a2 Merge pull request #826 from gouz/patch-4
[-] BO : Export DeliverySlip, the dates range using delivery_date but date_add
2013-10-09 06:02:52 -07:00
Damien Metzger 9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Rémi Gaillard 6f1cdba40e // typo 2013-10-09 14:56:41 +02:00
Jerome Nadaud 4242e485c7 // Bootstrap design on getPath 2013-10-09 14:25:46 +02:00
Jerome Nadaud a1ced4ee32 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 14:07:17 +02:00
Jerome Nadaud 3cca8206b9 // Fix missing unwanted div 2013-10-09 14:06:22 +02:00
gRoussac df97566018 [-] BO : AdminImport no default value for separators 2013-10-09 13:57:36 +02:00
gRoussac 338efcad7f [-] CORE : $smarty->compile_check is not set to false, thanks @prestamodule 2013-10-09 12:14:49 +02:00
Vincent Augagneur ced6554133 //loyalty module now use bootstrap design 2013-10-09 11:19:32 +02:00
Damien Metzger c982d08b68 // Removed useless link to the current page in the breadcrumb 2013-10-09 11:12:33 +02:00
Rémi Gaillard 3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Damien Metzger 623b8c7960 // Added expense management to profitability KPI 2013-10-09 10:55:12 +02:00
Vincent Augagneur e16676efaa //added prefix & suffix on helper form 2013-10-09 10:51:04 +02:00
Sylvain Gougouzian 7a6dea4964 [~] BO : Export DeliverySlip
The dates range wasn't using the correct sql fields.
2013-10-09 10:39:24 +02:00
Damien Metzger 38143e1245 // Fixed stats bug (bad id for ajax request) 2013-10-09 10:05:24 +02:00
Jerome Nadaud 8c9dffd854 // Add pagination to states list 2013-10-09 10:03:27 +02:00
Jerome Nadaud 9bdde5c5c0 // Add pagination to countries list 2013-10-09 09:59:49 +02:00
Jerome Nadaud 18d909c05d // Add cache control to ajax request for ipad 2013-10-09 09:55:17 +02:00
Jerome Nadaud d448891065 // Add new country button to countries controller 2013-10-09 09:51:25 +02:00
Kevin Granger daa1cc47db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-09 09:43:10 +02:00
Kevin Granger b4459e39a4 // Orders WIP 2013-10-09 09:43:04 +02:00
Jerome Nadaud 57c34488ff // Orders refund buttons 2013-10-09 09:41:51 +02:00
Jerome Nadaud 5a4548bd51 // Toolbar for search 2013-10-09 09:41:10 +02:00
gRoussacandJerome Nadaud fcc2930693 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-09 09:19:22 +02:00
Jerome Nadaud f9373e6178 // Fix toolbar button and toolbar title for invoices 2013-10-09 08:53:36 +02:00
Rémi Gaillard 60214d8fb6 // nothing 2013-10-08 22:11:28 +02:00
Damien Metzger d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Kevin Granger 797a6c121a // Orders WIP 2013-10-08 18:53:41 +02:00