Rémi Gaillard
f9b1545037
// missing file
2013-10-30 14:59:08 +01:00
gRoussac
8953c55b7f
[-] BO : Adminimport default customers group
2013-10-30 12:30:22 +01:00
gRoussac
26b4fbf883
[*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2
2013-10-29 19:07:31 +01:00
gRoussac
c98b5e0c78
[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski
2013-10-29 19:05:21 +01:00
Gregory Roussac
90bef56c84
Merge pull request #907 from djfm/development
...
// Frenglish
2013-10-29 08:24:45 -07:00
djfm
9d18ef8186
// Frenglish
2013-10-29 14:44:51 +00:00
Damien Metzger
d5eedd5eaa
Merge pull request #906 from djfm/development
...
// Small fix
2013-10-29 07:42:07 -07:00
gRoussac
a43851469e
[-] CORE : Currency conversion rate can not be 0
2013-10-29 15:39:17 +01:00
djfm
0288696c90
// English
2013-10-29 14:37:55 +00:00
PhpMadman
87bb957431
fixed missing comma
2013-10-29 13:28:00 +01:00
PhpMadman
7b029457e4
[-] BO : hide stmp options when selecting never send emails
2013-10-29 12:41:24 +01:00
Jerome Nadaud
b605f33359
[-] BO : FixBug #PSCFV-10866 - Tagify system not working
2013-10-29 12:07:30 +01:00
Jerome Nadaud
580e201c48
[-] BO : FixBug #PSCFV-9319 - display only valid order id
2013-10-29 11:38:48 +01:00
gRoussac
1bee84d26c
[-] BO : Do not delete other default jpg when _deleteOldImages and type defined
2013-10-29 10:57:33 +01:00
gRoussac
af61191a7e
// rename field Action when out of stock
2013-10-29 10:55:46 +01:00
gRoussac
0aca1d4a67
[*] BO : AdminProducts find smallest images
2013-10-29 08:47:41 +01:00
gRoussac
e86c56172d
[*] FO: Can not establish purchase total when tax incl.
2013-10-28 17:42:23 +01:00
gRoussac
2dbaa5f73b
[-] BO : Fix bug #10689 , could not set image legend in back office
2013-10-27 22:49:25 +01:00
gRoussac
025b62f995
// norms
2013-10-25 17:33:44 +02:00
gRoussac
a9643c80c3
// bad commit sorry
2013-10-24 22:45:43 +02:00
gRoussac
438a3dda2b
[-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update
2013-10-24 22:42:13 +02:00
gRoussac
97ef888345
[-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled
2013-10-24 21:28:22 +02:00
indesign47
ea8a5277f2
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 15:44:11 +02:00
gRoussac
56693da6e0
// remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702
2013-10-23 19:02:13 +02:00
gRoussac
3e33a259ef
[-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base
2013-10-23 18:33:37 +02:00
gRoussac
8e506ddff2
[-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts
2013-10-23 18:16:45 +02:00
gRoussac
03ad842697
[-] BO : Fix bug #PSCFV-10790, Customer group names not exploded
2013-10-23 16:07:28 +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
6cddb57ce3
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
2013-10-23 10:34:00 +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
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
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
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
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
Rémi Gaillard
8a682081de
// typo
2013-10-18 12:17:51 +02:00
gRoussac
3a38af9982
[-] FO : Could not redirect back to url in adress.php
2013-10-17 14:16:54 +02:00
gRoussac
237b950eb6
[-] FO : #PSCFV-10640 again, bad assignement
2013-10-15 16:35:58 +02:00
gRoussac
7ae9832992
// small cast
2013-10-15 14:56:25 +02:00
gRoussac
81497be5ab
[-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC
2013-10-15 14:53:44 +02:00
gRoussac
9c861642a5
[-] BO : AdminImport, wrong default separators
2013-10-15 10:09:16 +02:00
Gregory Roussac
dec9ef40a8
Merge pull request #841 from indesign47/patch-10
...
[+] BO : AdminImport add entity Alias
2013-10-15 01:03:33 -07:00
Gregory Roussac
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
gRoussac
50002ec714
[-] FO : Fix #PSCFV-10690 again, change just on directories
2013-10-14 14:23:26 +02:00
gRoussac
c6e3e28894
[-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt
2013-10-14 14:20:11 +02:00
