antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-10169' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-08 17:44:41 +02:00
commit 650473ff85
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/bulkupdate/AdminBulkUpdate.php
View File

@ -1207,7 +1207,10 @@ class AdminBulkUpdate extends AdminTab {
'id_TVA',
// 'active',
'description_short',
'description',
'bon_a_savoir',
'plus',
'videos',
'livraison',
'images',
'nb_images',
'categories',
@ -1365,6 +1368,9 @@ class AdminBulkUpdate extends AdminTab {
// $p->active,
$p->description_short[$id_lang],
$p->description[$id_lang],
$p->description_more[$id_lang],
$p->videos[$id_lang],
$p->description_delivery[$id_lang],
count($c_images) > 0? implode(', ', $c_images): implode(', ', $images),
count($c_images) > 0? count($c_images): count($images),
$categorie_0,
@ -1422,6 +1428,9 @@ class AdminBulkUpdate extends AdminTab {
// $p->active,
$p->description_short[$id_lang],
$p->description[$id_lang],
$p->description_more[$id_lang],
$p->videos[$id_lang],
$p->description_delivery[$id_lang],
implode(', ', $images),
count($images),
$categorie_0,
@ -1497,7 +1506,10 @@ class AdminBulkUpdate extends AdminTab {
'BDC HT',
// 'active',
'description_short',
'description',
'bon_a_savoir',
'plus',
'videos',
'livraison',
'images',
'categories',
'sous-categories',
@ -1654,6 +1666,9 @@ class AdminBulkUpdate extends AdminTab {
// $p->active,
$p->description_short[$id_lang],
$p->description[$id_lang],
$p->description_more[$id_lang],
$p->videos[$id_lang],
$p->description_delivery[$id_lang],
count($c_images) > 0? implode(', ', $c_images): implode(', ', $images),
$categorie_0,
$categorie_1,
@ -1715,6 +1730,9 @@ class AdminBulkUpdate extends AdminTab {
// $p->active,
$p->description_short[$id_lang],
$p->description[$id_lang],
$p->description_more[$id_lang],
$p->videos[$id_lang],
$p->description_delivery[$id_lang],
implode(', ', $images),
$categorie_0,
$categorie_1,

11
modules/privatesales_logistique/AdminPrivateSalesLogistique.php
View File

@ -601,7 +601,10 @@ class AdminPrivateSalesLogistique extends AdminTab {
'BDC HT',
'id_TVA',
'description_short',
'description',
'bon_a_savoir',
'plus',
'videos',
'livraison',
'images',
'nb_images',
'categories',
@ -742,6 +745,9 @@ class AdminPrivateSalesLogistique extends AdminTab {
// $p->active,
$p->description_short[$id_lang],
$p->description[$id_lang],
$p->description_more[$id_lang],
$p->videos[$id_lang],
$p->description_delivery[$id_lang],
count($c_images) > 0? implode(', ', $c_images): implode(', ', $images),
count($c_images) > 0? count($c_images): count($images),
$categorie_0,
@ -782,6 +788,9 @@ class AdminPrivateSalesLogistique extends AdminTab {
$p->id_tax_rules_group,
$p->description_short[$id_lang],
$p->description[$id_lang],
$p->description_more[$id_lang],
$p->videos[$id_lang],
$p->description_delivery[$id_lang],
implode(', ', $images),
count($images),
$categorie_0,