Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed no more required hidden option

Browse Source
This commit is contained in:
Laurent Destailleur
2018-03-15 14:00:46 +01:00
parent b2e4c6cf14
commit ff4d60dd96
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/societe/card.php
View File

@@ -181,12 +181,12 @@ if (empty($reshook))
// Merge categories // Merge categories
$static_cat = new Categorie($db); $static_cat = new Categorie($db);
$custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id'); $custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id');
$custcats = $static_cat->containing($object->id, 'customer', 'id'); $custcats = $static_cat->containing($object->id, 'customer', 'id');
$custcats = array_merge($custcats,$custcats_ori); $custcats = array_merge($custcats,$custcats_ori);
$object->setCategories($custcats, 'customer'); $object->setCategories($custcats, 'customer');
$suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id'); $suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id');
$suppcats = $static_cat->containing($object->id, 'supplier', 'id'); $suppcats = $static_cat->containing($object->id, 'supplier', 'id');
$suppcats = array_merge($suppcats,$suppcats_ori); $suppcats = array_merge($suppcats,$suppcats_ori);
@@ -1266,7 +1266,7 @@ else
// Vat is used // Vat is used
print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td>'; print '<tr><td>'.fieldLabel('VATIsUsed','assujtva_value').'</td>';
print '<td>'; print '<td>';
print $form->selectyesno('assujtva_value',(isset($conf->global->THIRDPARTY_DEFAULT_USEVAT)?$conf->global->THIRDPARTY_DEFAULT_USEVAT:1),1); // Assujeti par defaut en creation print $form->selectyesno('assujtva_value', GETPOST('assujtva_value','int'), 1); // Assujeti par defaut en creation
print '</td>'; print '</td>';
print '<td class="nowrap">'.fieldLabel('VATIntra','intra_vat').'</td>'; print '<td class="nowrap">'.fieldLabel('VATIntra','intra_vat').'</td>';
print '<td class="nowrap">'; print '<td class="nowrap">';