Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

Browse Source
This commit is contained in:
Laurent Destailleur
2015-06-14 17:02:11 +02:00
parent 14a8a2269b fdced80a48
commit 1007aba6a9
6 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -37,6 +37,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme
- Fix: [ bug #2542 ] Contracts store localtax preferences - Fix: [ bug #2542 ] Contracts store localtax preferences
- Fix: Bad permission assignments for stock movements actions - Fix: Bad permission assignments for stock movements actions
- Fix: [ bug #2891 ] Category hooks do not work
***** ChangeLog for 3.6.2 compared to 3.6.1 ***** ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
- Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.

3
htdocs/categories/edit.php
View File

@@ -56,6 +56,9 @@ $object = new Categorie($db);
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('categorycard'));
/* /*
* Actions * Actions
*/ */

3
htdocs/categories/fiche.php
View File

@@ -64,6 +64,9 @@ $object = new Categorie($db);
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('categorycard'));
/* /*
* Actions * Actions
*/ */

3
htdocs/categories/viewcat.php
View File

@@ -63,6 +63,9 @@ $type=$object->type;
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element); $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('categorycard'));
/* /*
* Actions * Actions
*/ */

2
htdocs/core/tpl/objectline_create.tpl.php
View File

@@ -184,7 +184,7 @@ else {
<td align="right"><?php <td align="right"><?php
if (GETPOST('prod_entry_mode') != 'predef') if (GETPOST('prod_entry_mode') != 'predef')
{ {
if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" value="0">0'; if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" value="0"> '.vatrate(0, true);
else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer); else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
} }
?> ?>

4
htdocs/product/liste.php
View File

@@ -49,8 +49,8 @@ $sall=GETPOST("sall");
$type=GETPOST("type","int"); $type=GETPOST("type","int");
$search_sale = GETPOST("search_sale"); $search_sale = GETPOST("search_sale");
$search_categ = GETPOST("search_categ",'int'); $search_categ = GETPOST("search_categ",'int');
$tosell = GETPOST("tosell"); $tosell = GETPOST("tosell", 'int');
$tobuy = GETPOST("tobuy"); $tobuy = GETPOST("tobuy", 'int');
$fourn_id = GETPOST("fourn_id",'int'); $fourn_id = GETPOST("fourn_id",'int');
$catid = GETPOST('catid','int'); $catid = GETPOST('catid','int');