ea8a5277f2
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 15:44:11 +02:00
56693da6e0
// remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702
2013-10-23 19:02:13 +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
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
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
6cddb57ce3
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
2013-10-23 10:34:00 +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
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
d20aea0563
[-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced
2013-10-22 11:27:45 +02:00
d25b41ef97
[-] BO : wrong csv files name
2013-10-21 14:34:59 +02:00
8a682081de
// typo
2013-10-18 12:17:51 +02:00
9c861642a5
[-] BO : AdminImport, wrong default separators
2013-10-15 10:09:16 +02:00
dec9ef40a8
Merge pull request #841 from indesign47/patch-10
...
[+] BO : AdminImport add entity Alias
2013-10-15 01:03:33 -07:00
2a28e47650
Merge pull request #799 from Lupul/development
...
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
2013-10-14 08:37:28 -07:00
50002ec714
[-] FO : Fix #PSCFV-10690 again, change just on directories
2013-10-14 14:23:26 +02:00
c6e3e28894
[-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt
2013-10-14 14:20:11 +02:00
2a54296b96
[-] BO : Fix bug #PSCFV-10692, AdminImport bad utf8 cars for subst
2013-10-14 12:11:47 +02:00
5e407db21e
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-14 09:30:45 +00:00
3bc02bbe10
// fields are already correctly formated when they are in a object coming from the database
2013-10-14 10:56:38 +02:00
85c6e799c3
[+] BO : AdminImport add entity Alias
2013-10-12 11:33:36 +02:00
0f9c81a683
[-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message
2013-10-11 17:29:44 +02:00
1a1f3de775
[-] BO: Fixbug #PSCFV-10671 - Double htmlentities.
2013-10-11 13:33:31 +02:00
bb96c8754f
[*] LO : set correct currency format for CHF
2013-10-11 07:14:30 +00:00
dc1632a8b0
[-] BO : Adminimport, id_specific key_price not defined
2013-10-10 22:04:42 +02:00
a87bbf84b4
Merge pull request #825 from indesign47/patch-4
...
[-] BO : AdminImport add available fields to Products
2013-10-10 10:22:43 -07:00
4505387046
// Try to fix regexp issues with some PHP configurations
2013-10-10 18:41:50 +02:00
286084c42d
Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master
...
Conflicts:
controllers/admin/AdminImportController.php
2013-10-10 17:06:13 +02:00
39a543188a
[-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT
2013-10-10 14:54:12 +02:00
d796d0012e
[-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier
2013-10-09 15:25:02 +02:00
df97566018
[-] BO : AdminImport no default value for separators
2013-10-09 13:57:36 +02:00
fa88a0bd93
Update AdminTranslationsController.php
...
Fixes issue where path is not printed when error with email template saves occur.
2013-10-08 20:54:52 +08:00
2899dfba5e
// Fix AdminTranslationsController::addNewTabs()
2013-10-08 14:53:02 +02:00
30adb0932d
[-] BO : pass correct typed parameter to setCurrency
2013-10-07 23:42:26 +03:00
7d0e9a5f06
// Fix double entities on AdminLog listing #PSCFV-10472
2013-10-07 19:37:58 +02:00
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
b61e3e68b9
Update AdminImportController.php
2013-10-05 10:50:19 +02:00
1787923c4c
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase)
2013-10-05 00:42:29 +03:00
481cb5c28a
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
2013-10-04 23:30:24 +03:00
75cb92c329
Update AdminImportController.php
2013-10-04 11:44:52 +02:00
96646b5c7a
[-] BO : AdminImport add products available fields
2013-10-04 10:56:41 +02:00
0af24ab034
[-] BO : AdminImport add adresses required fields
2013-10-04 04:31:51 +02:00
31f421153d
[-] BO : Fix bug #PSCFV-9323 supplier_reference can be unset
2013-10-03 18:20:45 +02:00
c75cda2429
[*] BO : AdminImport, retrieve separators and lang selected
2013-10-03 17:35:20 +02:00
7f32e8d187
[-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot
2013-10-03 16:09:43 +02:00
8b2215eec5
// remove warning
2013-10-03 15:02:48 +02:00
0f288583ca
[-] BO : Remove dead code in AdminImport
2013-10-03 14:57:03 +02:00
indesign47