diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 3f0085ad33a..f39f9efc54a 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -353,7 +353,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) $companystatic->name=$obj->socname; $companystatic->client=$obj->client; $companystatic->canvas=$obj->canvas; - print '
| '.$langs->trans("Filter").' | ||||
| '.$langs->trans("ThirdParty").' | '; + print ' | |||
| '.$langs->trans("ThirdParty").' | '; $filter='s.client in (1,2,3)'; print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"'); print ' | |||
| '.$langs->trans("CreatedBy").' | '; + print ' | |||
| '.$langs->trans("CreatedBy").' | '; print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); print ' | |||
| '.$langs->trans("Status").' | '; + print ' | |||
| '.$langs->trans("Status").' | '; $formpropal->selectProposalStatus(($object_status!=''?$object_status:-1),0,0,1,$mode,'object_status'); print ' | |||
| '.$langs->trans("Year").' | '; + print ' | |||
| '.$langs->trans("Year").' | '; if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year; if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear; arsort($arrayyears); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index f045e570c6e..37f08eb6b48 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -227,7 +227,7 @@ if ($socid > 0) print ' | |||
| '.$langs->trans("Date").' | '; print ''.$langs->trans("CustomerRelativeDiscountShort").' | '; - print ''.$langs->trans("NoteReason").' | '; + print ''.$langs->trans("NoteReason").' | '; print ''.$langs->trans("User").' | '; print '
| '.dol_print_date($db->jdate($obj->dc),"dayhour").' | '; print ''.price2num($obj->remise_percent).'% | '; - print ''.$obj->note.' | '; + print ''.$obj->note.' | '; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.' | '; print '
| '.$langs->trans("Date").' | '; print ''.$langs->trans("CustomerRelativeDiscountShort").' | '; - print ''.$langs->trans("NoteReason").' | '; + print ''.$langs->trans("NoteReason").' | '; print ''.$langs->trans("User").' | '; print '
| '.dol_print_date($db->jdate($obj->dc),"dayhour").' | '; print ''.price2num($obj->remise_percent).'% | '; - print ''.$obj->note.' | '; + print ''.$obj->note.' | '; print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.' | '; print '