81482df1e5
// Fix merge
2013-10-25 14:33:29 +02:00
8d1765f2df
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
controllers/admin/AdminCategoriesController.php
2013-10-25 14:29:02 +02:00
bff1ad8833
// Some changes to integrate uploader helper
2013-10-25 14:20:42 +02:00
3997543e7f
// notice
2013-10-25 11:35:01 +02:00
087d0d8206
// Fields resizing
2013-10-25 11:25:13 +02:00
0ca5a24e84
// Added field (bootstrap) size in helper form
2013-10-25 10:16:39 +02:00
a9643c80c3
// bad commit sorry
2013-10-24 22:45:43 +02:00
438a3dda2b
[-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update
2013-10-24 22:42:13 +02:00
97ef888345
[-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled
2013-10-24 21:28:22 +02:00
cd5fa81025
// Fixed boulette
2013-10-24 19:29:22 +02:00
ea7b8b175e
// Fix list title
2013-10-24 17:18:14 +02:00
df639337af
// Code cleaning and small fixes
2013-10-24 17:04:55 +02:00
2931c20914
// Fixed rounding
2013-10-24 16:38:48 +02:00
ea8a5277f2
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 15:44:11 +02:00
a1df97776a
// Set default values
2013-10-24 13:54:55 +02:00
92c2f6953f
changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 11:44:52 +02:00
9a7c3dd88f
// small fix
2013-10-24 10:14:44 +02:00
56693da6e0
// remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702
2013-10-23 19:02:13 +02:00
7a8cdf3913
// admin create order WIP
2013-10-23 18:54:44 +02:00
3e33a259ef
[-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base
2013-10-23 18:33:37 +02:00
e1887425fa
[*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import
2013-10-23 18:22:53 +02:00
8e506ddff2
[-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts
2013-10-23 18:16:45 +02:00
03ad842697
[-] BO : Fix bug #PSCFV-10790, Customer group names not exploded
2013-10-23 16:07:28 +02:00
9930c375c7
// Dashgoals :)
2013-10-23 15:37:43 +02:00
554ab9414f
[-] BO: product listing should call Product::getPriceStatic() with the product default shop in the context when it is not a shop context
2013-10-23 15:08:02 +02:00
747ec9a2c4
// notice on carrierwizard when step back
2013-10-23 14:50:30 +02:00
be1299d8d7
// small fix
2013-10-23 14:19:19 +02:00
5ee716ff9e
// fix admin edit countries
2013-10-23 11:18:31 +02:00
45ea4aefad
// Fix Combinations ajax problem
2013-10-23 10:50:18 +02:00
6cddb57ce3
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
2013-10-23 10:34:00 +02:00
c61cec9f2a
//display date on dashproducts && added param date_from & date_to on dashboard hooks
2013-10-23 09:59:16 +02:00
ae63336a37
[-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category
2013-10-23 01:41:05 +02:00
5d28d38a22
[-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features
2013-10-23 01:18:09 +02:00
5bb4d48ddd
Merge pull request #870 from djfm/development
...
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
67fc91e2c9
// Categories thumbnails
2013-10-22 17:43:10 +02:00
3539a779f8
// Oops
2013-10-22 17:32:02 +02:00
4e8ba711d9
// Oops
2013-10-22 17:15:08 +02:00
7cbaada844
[BO][-] Notice messages when accessing the BO translation page
...
When accessing the translation part with "core translation" , you got 2 errors:
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in controllers\admin\AdminTranslationsController.php on line 1018
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in \controllers\admin\AdminTranslationsController.php on line 1026
It's because the variable $this->theme_selected is not set for that case.
2013-10-22 17:00:56 +02:00
8ef9e71966
// Refine dashboard net profits
2013-10-22 15:16:22 +02:00
857c66454b
// Typo
2013-10-22 11:47:47 +02:00
16cf10d586
// New profitability calculation
2013-10-22 11:39:57 +02:00
d20aea0563
[-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced
2013-10-22 11:27:45 +02:00
96766a311e
// Unify form fields for image preferences
2013-10-22 10:10:15 +02:00
eb82297f45
// small fixs
2013-10-22 10:04:45 +02:00
f336cc599b
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
58aa64fab7
// Code cleaning
2013-10-21 18:18:48 +02:00
2e13013657
// search field WIP
2013-10-21 18:03:00 +02:00
d25b41ef97
[-] BO : wrong csv files name
2013-10-21 14:34:59 +02:00
35df3f463c
Removed unsed code
...
I looked through the code. And I can't see that that code is used. everything is handled in PDF class.
2013-10-21 10:10:28 +02:00
6275e7bcad
// Remove translations on icon class
2013-10-21 09:57:13 +02:00
Jerome Nadaud