mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Fix duplicate ;
This commit is contained in:
parent
72131110e7
commit
d2d7b0defd
|
|
@ -1937,7 +1937,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
|
|||
if (!empty($conf->societe->enabled) && !$object->socid) {
|
||||
if ($user->rights->societe->creer) {
|
||||
if (Adherent::STATUS_DRAFT != $object->statut) {
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a>'."\n";;
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a>'."\n";
|
||||
} else {
|
||||
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a>'."\n";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ if ($mode) {
|
|||
print '</tr>';
|
||||
|
||||
foreach ($data as $val) {
|
||||
$year = isset($val['year']) ? $val['year'] : '';;
|
||||
$year = isset($val['year']) ? $val['year'] : '';
|
||||
print '<tr class="oddeven">';
|
||||
print '<td>'.$val['label'].'</td>';
|
||||
if (isset($label2)) {
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
|
|||
$object->morphy = trim($morphy);
|
||||
$object->status = (int) $status;
|
||||
$object->subscription = (int) $subscription;
|
||||
$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));;
|
||||
$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));
|
||||
$object->duration_value = $duration_value;
|
||||
$object->duration_unit = $duration_unit;
|
||||
$object->note = trim($comment);
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ if ($action == "sign" && $permissiontoclose) {
|
|||
foreach ($toselect as $checked) {
|
||||
if ($tmpproposal->fetch($checked)) {
|
||||
if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED) {
|
||||
$tmpproposal->statut = $tmpproposal::STATUS_SIGNED;;
|
||||
$tmpproposal->statut = $tmpproposal::STATUS_SIGNED;
|
||||
if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_SIGNED)) {
|
||||
setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -751,7 +751,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
|
|||
$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
|
||||
$sql .= " pa.datep as datep, pa.ref as payment_ref";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";
|
||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";;
|
||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";
|
||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymenttable." as pa ON pa.rowid = pf.".$fk_payment;
|
||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
|
||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
|
|||
|
||||
$text = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
|
||||
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";
|
||||
|
||||
print $text;
|
||||
|
||||
|
|
|
|||
|
|
@ -542,7 +542,7 @@ print '<div class="center subscriptionformhelptext justify">';
|
|||
// Welcome message
|
||||
$text = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationBoothWelcomeMessage").'</strong></td></tr></br>';
|
||||
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationBoothHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";
|
||||
print $text;
|
||||
print '</div>';
|
||||
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ print '<div class="center subscriptionformhelptext justify">';
|
|||
// Welcome message
|
||||
$text = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").'</strong></td></tr></br>';
|
||||
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";
|
||||
print $text;
|
||||
print '</div>';
|
||||
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) {
|
|||
print '<table id="welcome" class="center">'."\n";
|
||||
$text = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
|
||||
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgVoteHelpMessage").' : "'.$project->title.'".<br><br></td></tr>'."\n";
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
|
||||
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";
|
||||
print $text;
|
||||
print '</table>'."\n";
|
||||
|
||||
|
|
|
|||
|
|
@ -1804,7 +1804,7 @@ if ($action == 'create') {
|
|||
$form_close .= $object->note_private;
|
||||
$form_close .= '</textarea></td></tr>';
|
||||
$form_close .= '</table>';
|
||||
$form_close .= $form->buttonsSaveCancel();;
|
||||
$form_close .= $form->buttonsSaveCancel();
|
||||
$form_close .= '<a id="acceptedrefused"> </a>';
|
||||
$form_close .= '</form>';
|
||||
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ button.publicphonebutton {
|
|||
float:left;
|
||||
width: 50%;
|
||||
text-align:center;
|
||||
height:150px;;
|
||||
height:150px;
|
||||
overflow:hidden;
|
||||
margin-bottom:5px;
|
||||
font-size:18px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user