Damien Metzger
9930c375c7
// Dashgoals :)
2013-10-23 15:37:43 +02:00
Rémi Gaillard
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
Rémi Gaillard
747ec9a2c4
// notice on carrierwizard when step back
2013-10-23 14:50:30 +02:00
Rémi Gaillard
be1299d8d7
// small fix
2013-10-23 14:19:19 +02:00
Kevin Granger
5ee716ff9e
// fix admin edit countries
2013-10-23 11:18:31 +02:00
Jerome Nadaud
45ea4aefad
// Fix Combinations ajax problem
2013-10-23 10:50:18 +02:00
Rémi Gaillard
6cddb57ce3
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
2013-10-23 10:34:00 +02:00
Vincent Augagneur
c61cec9f2a
//display date on dashproducts && added param date_from & date_to on dashboard hooks
2013-10-23 09:59:16 +02:00
gRoussac
ae63336a37
[-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category
2013-10-23 01:41:05 +02:00
gRoussac
5d28d38a22
[-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features
2013-10-23 01:18:09 +02:00
Gregory Roussac
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
Jerome Nadaud
67fc91e2c9
// Categories thumbnails
2013-10-22 17:43:10 +02:00
Damien Metzger
3539a779f8
// Oops
2013-10-22 17:32:02 +02:00
Damien Metzger
4e8ba711d9
// Oops
2013-10-22 17:15:08 +02:00
ldecoker
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
Damien Metzger
8ef9e71966
// Refine dashboard net profits
2013-10-22 15:16:22 +02:00
Damien Metzger
857c66454b
// Typo
2013-10-22 11:47:47 +02:00
Damien Metzger
16cf10d586
// New profitability calculation
2013-10-22 11:39:57 +02:00
gRoussac
d20aea0563
[-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced
2013-10-22 11:27:45 +02:00
Jerome Nadaud
96766a311e
// Unify form fields for image preferences
2013-10-22 10:10:15 +02:00
Kevin Granger
eb82297f45
// small fixs
2013-10-22 10:04:45 +02:00
Jerome Nadaud
f336cc599b
// Btn-primary replacement
2013-10-21 18:56:41 +02:00
Damien Metzger
58aa64fab7
// Code cleaning
2013-10-21 18:18:48 +02:00
Kevin Granger
2e13013657
// search field WIP
2013-10-21 18:03:00 +02:00
gRoussac
d25b41ef97
[-] BO : wrong csv files name
2013-10-21 14:34:59 +02:00
PhpMadman
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
Jerome Nadaud
6275e7bcad
// Remove translations on icon class
2013-10-21 09:57:13 +02:00
gRoussac
9b8a7edad8
// small refacto
2013-10-21 01:05:18 +02:00
gRoussac
c9d20f35b3
// norms
2013-10-21 00:00:17 +02:00
gRoussac
f2d70076bd
[-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration
2013-10-20 23:52:48 +02:00
Jerome Nadaud
cdab5ed6c9
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
2013-10-18 18:47:42 +02:00
Jerome Nadaud
7e176b157b
// Fix save and preview button
2013-10-18 18:44:13 +02:00
Kevin Granger
04b4e548f3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-18 18:38:17 +02:00
Kevin Granger
5f52a9e171
// fix products
2013-10-18 18:38:02 +02:00
Damien Metzger
d1a2c33322
Merge pull request #849 from djfm/bootstrap
...
// Translations fix
2013-10-18 09:35:20 -07:00
Jerome Nadaud
1c1fb5fb5c
// Update image fix
2013-10-18 17:59:45 +02:00
Jerome Nadaud
1bee0087c0
// Update image fix
2013-10-18 17:50:36 +02:00
Jerome Nadaud
964f546b0b
// Update image when updated
2013-10-18 17:41:36 +02:00
Jerome Nadaud
0599d4f056
// Fix Localization page header title
2013-10-18 17:41:10 +02:00
djfm
b5b18b9d2b
// use sprintf
2013-10-18 13:55:30 +00:00
Rémi Gaillard
8a682081de
// typo
2013-10-18 12:17:51 +02:00
Jerome Nadaud
088d23f8f9
// Add edit button to customer groups view list
2013-10-17 18:27:00 +02:00
Jerome Nadaud
08525e5af4
// Fix missing commits !!!!
2013-10-17 15:59:46 +02:00
gRoussac
3a38af9982
[-] FO : Could not redirect back to url in adress.php
2013-10-17 14:16:54 +02:00
Jerome Nadaud
99f66e26d0
// Change datepicker class
2013-10-17 13:24:46 +02:00
Jerome Nadaud
1f93d071c2
// Add transplant module button to page header toolbar
2013-10-17 13:24:01 +02:00
Jerome Nadaud
cee6c2b2d6
// Add class to calendar.tpl
2013-10-17 11:40:58 +02:00
Jerome Nadaud
f9b115a2f8
// Date Range picker improvements
2013-10-17 11:39:02 +02:00
gRoussac
b67a78f9dd
[-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC
2013-10-17 11:37:45 +02:00
Jerome Nadaud
1f50e074f7
// New order button fix
2013-10-17 09:37:19 +02:00
Damien Metzger