lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	htdocs/product/fiche.php
This commit is contained in:
Laurent Destailleur 2014-02-12 00:25:08 +01:00
commit 634c5b64f1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/index.php
View File

@ -455,7 +455,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1">('.$num.')</td></tr>'; print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1">('.$num.')</td></tr>';
$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?1000:$conf->global->MAIN_MAXLIST_OVERLOAD)); $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
while ($i < $nbofloop) while ($i < $nbofloop)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);

2
htdocs/comm/propal/class/propal.class.php
View File

@ -1645,7 +1645,7 @@ class Propal extends CommonObject
* @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function reopen($user, $statut, $note, $notrigger=0) function reopen($user, $statut, $note='', $notrigger=0)
{ {
global $langs,$conf; global $langs,$conf;

2
htdocs/comm/propal/index.php
View File

@ -315,7 +315,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1">('.$num.')</a></td></tr>'; print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1">('.$num.')</a></td></tr>';
$nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?1000:$conf->global->MAIN_MAXLIST_OVERLOAD)); $nbofloop=min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD)?500:$conf->global->MAIN_MAXLIST_OVERLOAD));
while ($i < $nbofloop) while ($i < $nbofloop)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);

2
htdocs/core/class/commonobject.class.php
View File

@ -2335,7 +2335,7 @@ abstract class CommonObject
$label = '<span class="fieldrequired">'.$label.'</span>'; $label = '<span class="fieldrequired">'.$label.'</span>';
$out .= '<td>'.$label.'</td>'; $out .= '<td>'.$label.'</td>';
$out .='<td colspan="'.$colspan.'">'; $out .='<td'.($colspan?' colspan="'.$colspan.'"':'').'>';
switch($mode) { switch($mode) {
case "view": case "view":

4
htdocs/product/fiche.php
View File

@ -846,11 +846,11 @@ else
print '</td></tr>'; print '</td></tr>';
// Other attributes // Other attributes
$parameters=array('colspan' => ' colspan="3"'); $parameters=array('colspan' => 3);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook) && ! empty($extrafields->attribute_label)) if (empty($reshook) && ! empty($extrafields->attribute_label))
{ {
print $object->showOptionals($extrafields,'edit'); print $object->showOptionals($extrafields,'edit',$parameters);
} }
// Note (private, no output on invoices, propales...) // Note (private, no output on invoices, propales...)