diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 3fd00c5727b..0235c7adc39 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -214,7 +214,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''."\n"; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 954ec82a9c2..5ca73fa0de3 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -261,7 +261,7 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; print ''; print '\n"; print '\n"; -print '\n"; +print '\n"; print ''; print ''; print ''."\n"; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 7b88fa1bd6f..1bd177a3015 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -550,7 +550,7 @@ else if ($id || $ref) if (! empty($conf->mailing->enabled)) { $langs->load("mails"); - print ''; + print ''; print ''; } else diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 7ad74302655..2bb710b310f 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -191,7 +191,7 @@ if ($act->id > 0) print ''; // Status - print ''; @@ -246,7 +246,7 @@ if ($act->id > 0) } // Priority - print ''; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 59b2e6c0a80..81a635e4d9f 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -537,7 +537,7 @@ if ($action == 'create') // Realised by if ($conf->global->AGENDA_ENABLE_DONEBY) { - print ''; } @@ -570,7 +570,7 @@ if ($action == 'create') // If company is forced, we propose contacts (may be contact is also forced) if (GETPOST("contactid") > 0 || GETPOST('socid','int') > 0) { - print ''; } @@ -600,7 +600,7 @@ if ($action == 'create') } // Priority - print ''; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 811e4a8d211..f5409681be8 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -293,7 +293,7 @@ if ($id > 0) } // TVA Intra - print ''; @@ -319,8 +319,8 @@ if ($id > 0) print ''; // Mode de reglement par defaut - print '
'.$langs->trans("Name")."'.$langs->trans("Description")."'.$langs->trans("Example")."'.$langs->trans("Example")."'.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'.$langs->trans("NbOfEMailingsReceived").''.$langs->trans("NbOfEMailingsReceived").''.$object->getNbOfEMailings().'
'.$langs->trans("Status").' / '.$langs->trans("Percentage").''; + print '
'.$langs->trans("Status").' / '.$langs->trans("Percentage").''; print $act->getLibStatut(4); print '
'.$langs->trans("Priority").''; + print '
'.$langs->trans("Priority").''; print ($act->priority?$act->priority:''); print '
'.$langs->trans("ActionDoneBy").''; + print '
'.$langs->trans("ActionDoneBy").''; $form->select_users(GETPOST("doneby")?GETPOST("doneby"):(! empty($actioncomm->userdone->id) && $percent==100?$actioncomm->userdone->id:0),'doneby',1); print '
'.$langs->trans("ActionOnContact").''; + print '
'.$langs->trans("ActionOnContact").''; $form->select_contacts(GETPOST('socid','int'),GETPOST('contactid'),'contactid',1); print '
'.$langs->trans("Priority").''; + print '
'.$langs->trans("Priority").''; print ''; print '
'.$langs->trans('VATIntra').''; + print '
'.$langs->trans('VATIntra').''; print $object->tva_intra; print '
'; - print '
'; + print '
'; + print ''; @@ -338,8 +338,8 @@ if ($id > 0) print ''; // Relative discounts (Discounts-Drawbacks-Rebates) - print '
'; print $langs->trans('PaymentMode'); print ''; if (($action != 'editmode') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetMode'),1).'
'; - print '
'; + print '
'; + print ''; // Absolute discounts (Discounts-Drawbacks-Rebates) - print '
'; print $langs->trans("CustomerRelativeDiscountShort"); print ''; if ($user->rights->societe->creer && !$user->societe_id > 0) @@ -351,9 +351,9 @@ if ($id > 0) print '
'; + print '
'; print ''; - print '
'; + print '
'; print $langs->trans("CustomerAbsoluteDiscountShort"); print ''; if ($user->rights->societe->creer && !$user->societe_id > 0) @@ -373,8 +373,8 @@ if ($id > 0) // Multiprice level if (! empty($conf->global->PRODUIT_MULTIPRICES)) { - print '
'; - print '
'; + print '
'; + print '
'; print $langs->trans("PriceLevel"); print ''; if ($user->rights->societe->creer) @@ -389,8 +389,8 @@ if ($id > 0) // Level of prospect if ($object->client == 2 || $object->client == 3) { - print '
'; - print '
'; + print '
'; + print ''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index f32fa89b59b..dff264b6f25 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -98,9 +98,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print '
'; print $langs->trans('ProspectLevel'); print ''; if ($action != 'editlevel' && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('Modify'),1).'
'; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print "
'.$langs->trans("SearchAProposal").'
'.$langs->trans("Ref").':'.$langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':
\n"; print "
\n"; @@ -117,9 +117,9 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) print ''; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print "
'.$langs->trans("SearchAContract").'
'.$langs->trans("Ref").':'.$langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':
\n"; print "
"; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 42944afabef..ac7cbdccb5d 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -55,10 +55,10 @@ print '
'; print ''; print ''; print ''; -print ''; print ''; -print ''; print "
'.$langs->trans("SearchAMailing").'
'; +print '
'; print $langs->trans("Ref").':
'; +print '
'; print $langs->trans("Other").':

\n"; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 2fd7c86fb9a..0e14848d1e8 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -80,7 +80,7 @@ if ($id > 0 || ! empty($ref)) // Ref client print '
'; - print ' - +
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 7e94ec5a912..2d7d432a51d 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -166,7 +166,7 @@ if ($object->id > 0) // Ref client print '
'; - print '"; - print ''; + print ''; $x_coll = 0; foreach($coll_listsell as $vatrate=>$val) @@ -166,7 +166,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) $x_coll+=$val['vat']; } $subtotalcoll = $subtotalcoll + $x_coll; - print ""; + print ""; $x_paye = 0; foreach($coll_listbuy as $vatrate=>$val) @@ -174,13 +174,13 @@ for ($m = 1 ; $m < 13 ; $m++ ) $x_paye+=$val['vat']; } $subtotalpaye = $subtotalpaye + $x_paye; - print ""; + print ""; $diff = $x_coll - $x_paye; $total = $total + $diff; $subtotal = $subtotal + $diff; - print "\n"; + print "\n"; print "\n"; print "\n"; diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index d283f877817..b97eca7bacb 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -263,11 +263,11 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") $var=!$var; print ""; print ""; - print ""; - print ""; + print ""; + print ""; print ""; - print ""; - print ""; + print ""; + print ""; print ""; print ""; print ""; @@ -286,7 +286,7 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") $var=!$var; print ""; print ''; - print "\n"; + print "\n"; print "\n"; $i++; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 88c1be06409..0d859d96c06 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -342,7 +342,7 @@ else print ''; // Ref - print ''; + print ''; // Description print ''; // VAT - print ''; if ($modetax == 0) { - print ''; + print ''; print ''; } print ''; - print ''; + print ''; print ''; } @@ -450,11 +450,11 @@ else print ''; if ($modetax == 0) { - print ''; + print ''; print ''; } print ''; - print ''; + print ''; print ''; } @@ -499,7 +499,7 @@ else print ''; // Ref - print ''; + print ''; // Description print ''; // VAT - print ''; if ($modetax == 0) { - print ''; + print ''; print ''; } print ''; - print ''; + print ''; print ''; } @@ -601,11 +601,11 @@ else print ''; if ($modetax == 0) { - print ''; + print ''; print ''; } print ''; - print ''; + print ''; print ''; } diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 4ca5f298514..ea9f7ea445d 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -60,9 +60,9 @@ if ($result) print '
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index b0eca76345b..b1b91cfb89c 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -133,7 +133,7 @@ if ($object->id > 0) // Ref client print '
'; - print ''; print ''; -print ''; +print ''; print ''; print "
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 70eb2e49092..45a594c12cd 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -69,7 +69,7 @@ print ''; print '
'.$langs->trans("SearchPropal").'
'; print $langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':

\n"; diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 633c0dd4cf4..a9ee5b6a839 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) // Ref client print '
'; - print ''; print ''; - print ''; + print ''; print ''; print "
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index e6496c32a58..1f3e0fc4c0c 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -60,7 +60,7 @@ if (! empty($conf->propal->enabled)) print '
'.$langs->trans("SearchAProposal").'
'; print $langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':

\n"; } diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index b4b92e760c5..10bc0b500f4 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref)) // Ref cde client print '
'; - print '"; - print ''; + print ''; $x_coll = 0; foreach($coll_listsell as $vatrate=>$val) @@ -157,7 +157,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) $x_coll+=$val['localtax2']; } $subtotalcoll = $subtotalcoll + $x_coll; - print ""; + print ""; $x_paye = 0; foreach($coll_listbuy as $vatrate=>$val) @@ -165,13 +165,13 @@ for ($m = 1 ; $m < 13 ; $m++ ) $x_paye+=$val['localtax2']; } $subtotalpaye = $subtotalpaye + $x_paye; - print ""; + print ""; $diff = $x_coll - $x_paye; $total = $total + $diff; $subtotal = $subtotal + $diff; - print "\n"; + print "\n"; print "\n"; print "\n"; diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php index e750403bf2c..07d81d81df8 100644 --- a/htdocs/compta/localtax/reglement.php +++ b/htdocs/compta/localtax/reglement.php @@ -56,9 +56,9 @@ if ($result) print '
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index cde8d1d4a35..055d4a42787 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -162,7 +162,7 @@ if ($id > 0 || ! empty($ref)) // Ref commande client print '
'; - print ''; print ''; -print ''; +print ''; print ''; print "
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 3c69388c8c9..2327c2063be 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -70,7 +70,7 @@ print ''; print '
'.$langs->trans("SearchOrder").'
'; print $langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':

\n"; diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index c9ca34854b7..58023beec33 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref)) // Ref commande client print '
'; - print ''; // Payment term - print ''; // Payment mode diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 9a3a55bfaf4..cc3f0cd548d 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -227,7 +227,7 @@ if ($resql) print "\n"; // Num - print '\n"; + print '\n"; // Description print "'; // Payment term - print ''; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index d2dbceea47f..b334053c5b4 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -363,8 +363,8 @@ if ($resql) print "\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; print ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index f26b9a06089..6340e00c28f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -288,7 +288,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- while ($i < $num && $i < 20) { $obj = $db->fetch_object($resql); - print '"; - print ""; + print '"; $company_static->id=$coll->socid; $company_static->nom=$coll->nom; - print ''; + print ''; $find = array(' ','.'); $replace = array('',''); - print ""; - print ""; - print ""; + print '"; + print ""; + print ""; $totalamount = $totalamount + $coll->amount; $total = $total + $coll->localtax2; print "\n"; @@ -194,8 +194,8 @@ if (is_array($coll_list)) $x_coll_sum = $total; print ''; - print ''; - print ''; + print ''; + print ''; print ''; } else @@ -245,15 +245,15 @@ if (is_array($coll_list)) } } print ""; - print ""; + print '"; $company_static->id=$coll->socid; $company_static->nom=$coll->nom; - print ''; + print ''; $find = array(' ','.'); $replace = array('',''); - print ""; - print ""; - print ""; + print '"; + print ""; + print ""; $totalamount = $totalamount + $coll->amount; $total = $total + $coll->localtax2; print "\n"; @@ -263,8 +263,8 @@ if (is_array($coll_list)) $x_paye_sum = $total; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print '
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 72599d11840..16696430d40 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -416,7 +416,7 @@ if ($action == 'create' && empty($mesgs)) $html->select_date(0,'','','','',"add",1,1); print '
'.$langs->trans('PaymentConditionsShort').''; + print '
'.$langs->trans('PaymentConditionsShort').''; $html->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id'); print '
'.($objp->num_chq?$objp->num_chq:"")."'.($objp->num_chq?$objp->num_chq:"").""; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index b8bc0b1ed10..d51cac1399e 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2253,7 +2253,7 @@ if ($action == 'create') print '
'.$langs->trans('PaymentConditionsShort').''; + print '
'.$langs->trans('PaymentConditionsShort').''; $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id'); print '
'.dol_print_date($db->jdate($objp->df),'day').''.dol_print_date($db->jdate($objp->datelimite),'day').''.dol_print_date($db->jdate($objp->df),'day').''.dol_print_date($db->jdate($objp->datelimite),'day').''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,28).'
'; + print '
'; $facturesupplierstatic->ref=$obj->ref; $facturesupplierstatic->id=$obj->rowid; $facturesupplierstatic->type=$obj->type; diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index e2eb5ab610c..72b02194bc1 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -176,15 +176,15 @@ if (is_array($coll_list)) } } print "
".$i."'.$i."'.$company_static->getNomUrl(1).''.$company_static->getNomUrl(1).'".$intra."".price($coll->amount)."".price($coll->localtax2)."'.$intra."".price($coll->amount)."".price($coll->localtax2)."
'.$langs->trans("Total").':'.price($totalamount).''.price($total).''.price($totalamount).''.price($total).'
".$i."'.$i."'.$company_static->getNomUrl(1).''.$company_static->getNomUrl(1).'".$intra."".price($coll->amount)."".price($coll->localtax2)."'.$intra."".price($coll->amount)."".price($coll->localtax2)."
'.$langs->trans("Total").':'.price($totalamount).''.price($total).''.price($totalamount).''.price($total).'
'; diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 3f0cb9828d5..8acfe896fed 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -149,7 +149,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) $var=!$var; print "
'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").''.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'".price($x_coll)."".price($x_coll)."".price($x_paye)."".price($x_paye)."".price($diff)."".price($diff)." 
'; print ''; - print ''; + print ''; print ""; - print ''; + print ''; print ""; print "\n"; $var=1; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index a0e2d498ee0..d242deedb38 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -196,13 +196,13 @@ if ($id) print ''; //Date - print ''; + print ''; print ''; //Reason - print ''; + print ''; print ''; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 83f248a39be..871e8a583ef 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -207,16 +207,16 @@ if (is_array($coll_list)) } } print ""; - print ""; + print '"; $company_static->id=$coll->socid; $company_static->nom=$coll->nom; $company_static->client=1; - print ''; + print ''; $find = array(' ','.'); $replace = array('',''); - print ""; - print ""; - print ""; + print '"; + print ""; + print ""; $totalamount = $totalamount + $coll->amount; $total = $total + $coll->tva; print "\n"; @@ -226,8 +226,8 @@ if (is_array($coll_list)) $x_coll_sum = $total; print ''; - print ''; - print ''; + print ''; + print ''; print ''; } else @@ -285,16 +285,16 @@ if (is_array($coll_list)) } } print ""; - print ""; + print '"; $company_static->id=$coll->socid; $company_static->nom=$coll->nom; $company_static->fournisseur=1; - print ''; + print ''; $find = array(' ','.'); $replace = array('',''); - print ""; - print ""; - print ""; + print '"; + print ""; + print ""; $totalamount = $totalamount + $coll->amount; $total = $total + $coll->tva; print "\n"; @@ -304,8 +304,8 @@ if (is_array($coll_list)) $x_paye_sum = $total; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print '
'.$langs->trans("Ref").''.$langs->trans("Ref").'".$langs->trans("Label")."'.$langs->trans("DatePayment").''.$langs->trans("DatePayment").'".$langs->trans("PayedByThisPayment")."
'.$langs->trans("RefusedData").'
'.$langs->trans("RefusedData").''; print $form->select_date('','','','','',"confirm_rejet"); print '
'.$langs->trans("RefusedReason").'
'.$langs->trans("RefusedReason").''; print $form->selectarray("motif", $rej->motifs); print '
".$i."'.$i."'.$company_static->getNomUrl(1,'customer').''.$company_static->getNomUrl(1,'customer').'".$intra."".price($coll->amount)."".price($coll->tva)."'.$intra."".price($coll->amount)."".price($coll->tva)."
'.$langs->trans("Total").':'.price($totalamount).''.price($total).''.price($totalamount).''.price($total).'
".$i."'.$i."'.$company_static->getNomUrl(1,'supplier').''.$company_static->getNomUrl(1,'supplier').'".$intra."".price($coll->amount)."".price($coll->tva)."'.$intra."".price($coll->amount)."".price($coll->tva)."
'.$langs->trans("Total").':'.price($totalamount).''.price($total).''.price($totalamount).''.price($total).'
'; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 7f23b6cfded..9bd05274f0a 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -158,7 +158,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) $var=!$var; print "
'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").''.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'".price($x_coll)."".price($x_coll)."".price($x_paye)."".price($x_paye)."".price($diff)."".price($diff)." 
$rate%".price($both['coll']['totalht'])."".price($both['coll']['vat'])."".price($both['coll']['totalht'])."".price($both['coll']['vat'])."".$both['coll']['links']."".price($both['paye']['totalht'])."".price($both['paye']['vat'])."".price($both['paye']['totalht'])."".price($both['paye']['vat'])."".$both['paye']['links']."
".price($diff)."".price($diff)."
'.$fields['link'].''.$fields['link'].''; @@ -374,7 +374,7 @@ else // Total HT if ($modetax == 0) { - print ''; + print ''; print price($fields['totalht']); if (price2num($fields['ftotal_ttc'])) { @@ -390,7 +390,7 @@ else if ($modetax == 0) { if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']); - print ''; + print ''; //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc']; if ($fields['payment_amount'] && $fields['ftotal_ttc']) { @@ -409,14 +409,14 @@ else } // Total collected - print ''; + print ''; $temp_ht=$fields['totalht']; if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice; print price(price2num($temp_ht,'MT')); print ''; + print ''; $temp_vat=$fields['vat']; if ($type == 1) $temp_vat=$fields['vat']*$ratiopaymentinvoice; print price(price2num($temp_vat,'MT')); @@ -435,11 +435,11 @@ else print ''.$langs->trans("Total").':   '.price(price2num($subtot_coll_total_ht,'MT')).''.price(price2num($subtot_coll_vat,'MT')).''.price(price2num($subtot_coll_vat,'MT')).'
'.$langs->trans("Total").':   '.price(price2num(0,'MT')).''.price(price2num(0,'MT')).''.price(price2num(0,'MT')).'
'.$fields['link'].''.$fields['link'].''; @@ -525,7 +525,7 @@ else // Total HT if ($modetax == 0) { - print ''; + print ''; print price($fields['totalht']); if (price2num($fields['ftotal_ttc'])) { @@ -541,7 +541,7 @@ else if ($modetax == 0) { if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']); - print ''; + print ''; if ($fields['payment_amount'] && $fields['ftotal_ttc']) { $paymentfourn_static->id=$fields['payment_id']; @@ -560,14 +560,14 @@ else } // VAT paid - print ''; + print ''; $temp_ht=$fields['totalht']; if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice; print price(price2num($temp_ht,'MT')); print ''; + print ''; $temp_vat=$fields['vat']; if ($type == 1) $temp_vat=$fields['vat']*$ratiopaymentinvoice; print price(price2num($temp_vat,'MT')); @@ -586,11 +586,11 @@ else print ''.$langs->trans("Total").':   '.price(price2num($subtot_paye_total_ht,'MT')).''.price(price2num($subtot_paye_vat,'MT')).''.price(price2num($subtot_paye_vat,'MT')).'
'.$langs->trans("Total").':   '.price(price2num(0,'MT')).''.price(price2num(0,'MT')).''.price(price2num(0,'MT')).'
'; print ''; - print ''; + print ''; print ""; - print ''; + print ''; print ""; print "\n"; $var=1; diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php index 0810624eb4c..a445444e42c 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php @@ -111,7 +111,7 @@ echo $this->control->tpl['ajax_selectcountry']; control->tpl['nb_emailing']) { ?> - + diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index d0ad081e92e..d7556f09f9f 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -96,7 +96,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] control->tpl['nb_emailing']) { ?> - + diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 94e8fadf3bf..7a88eb7d8cd 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -678,7 +678,7 @@ else if (! empty($conf->mailing->enabled)) { $langs->load("mails"); - print ''; + print ''; print ''; } else @@ -879,7 +879,7 @@ else if (! empty($conf->mailing->enabled)) { $langs->load("mails"); - print ''; + print ''; print ''; } else diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 845eaad86bb..05ee288b42c 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -80,9 +80,9 @@ if (! empty($conf->contrat->enabled)) print '
'.$langs->trans("Ref").''.$langs->trans("Ref").'".$langs->trans("Label")."'.$langs->trans("DatePayment").''.$langs->trans("DatePayment").'".$langs->trans("PayedByThisPayment")."
trans("Email"); ?> trans("NbOfEMailingsReceived"); ?>trans("NbOfEMailingsReceived"); ?> control->tpl['nb_emailing']; ?>  trans("EMail"); ?> control->tpl['email']; ?> trans("NbOfEMailingsReceived"); ?>trans("NbOfEMailingsReceived"); ?> control->tpl['nb_emailing']; ?>  '.$langs->trans("NbOfEMailingsReceived").''.$langs->trans("NbOfEMailingsReceived").''.$object->getNbOfEMailings().''.$langs->trans("NbOfEMailingsReceived").''.$langs->trans("NbOfEMailingsReceived").''.$object->getNbOfEMailings().'
'; print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print "
'.$langs->trans("SearchAContract").'
'.$langs->trans("Ref").':'.$langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':
\n"; print "
"; @@ -255,7 +255,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) while ($i < $num && $i < 20) { $obj = $db->fetch_object($resql); - print '
'; + print '
'; $staticcontrat->ref=$obj->ref; $staticcontrat->id=$obj->rowid; print $staticcontrat->getNomUrl(1,''); diff --git a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php index c19c0d5ec43..44b00b2154c 100755 --- a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php +++ b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php @@ -128,7 +128,7 @@ window.onload = function()
 Create New FolderCreate New Folder
diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html index 2f21e1c0afe..ebdd30c9376 100644 --- a/htdocs/core/modules/dons/html_cerfafr.html +++ b/htdocs/core/modules/dons/html_cerfafr.html @@ -22,7 +22,7 @@ __DonationRef__ -
+ @@ -45,7 +45,7 @@
No: -
+ __DonationRecipient__ @@ -79,7 +79,7 @@ -
+ __Donor__ diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index c907cf89ba0..bd396f0e8f5 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -199,7 +199,7 @@ if ($id > 0 || ! empty($ref)) // Ref expedition client print '
'; - print '
'; + print ''; print '
'; print $langs->trans('RefCustomer').''; print '
'; diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index f381b5bbd1c..33cf13ffc6f 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -185,7 +185,7 @@ if ($id > 0 || ! empty($ref)) // Ref commande client print '
'; - print '
'; + print ''; if ($action != 'RefCustomerOrder' && $commande->brouillon) print ''; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 516a975e5ab..00d7589448a 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1226,8 +1226,8 @@ elseif (! empty($object->id)) // Conditions de reglement par defaut $langs->load('bills'); $form = new Form($db); - print '
'; print $langs->trans('RefCustomer').''; print ''.img_edit($langs->trans('Modify')).'
'; - print '
'; + print '
'; + print ''; @@ -1247,8 +1247,8 @@ elseif (! empty($object->id)) // Mode of payment $langs->load('bills'); $form = new Form($db); - print '
'; print $langs->trans('PaymentConditions'); print ''; if ($action != 'editconditions') print 'id.'">'.img_edit($langs->trans('SetConditions'),1).'
'; - print '"; $classname = "impayee"; - print '\n"; - print "\n"; + print '\n"; - print "\n"; - print "\n"; + print '\n"; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 5899870b955..d61d49476bc 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -190,7 +190,7 @@ if ($object->fetch($id)) } // TVA Intra - print ''; diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 2751c963158..a6c0975ec97 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -180,7 +180,7 @@ if ($ok) // Loop on each file foreach($filelist as $file) { - print ''; $name = substr($file, 0, dol_strlen($file) - 4); diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 886276197e3..904144cad66 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -369,7 +369,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) foreach($filelist as $file) { print ''; - print ''."\n"; + print ''."\n"; // Run sql script $ok=run_sql($dir.$file, 0, '', 1); @@ -399,7 +399,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) foreach ($modulesfile as $modulefilelong => $modulefileshort) { print ''; - print ''."\n"; + print ''."\n"; // Run sql script $okmodule=run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not. diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index c5aa1916f70..aa262f9a6c2 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -1070,8 +1070,8 @@ else if ($showbarcode) { // Barcode type - print '
'; + print '
'; + print ''; if ($action != 'editmode') print ''; diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 52064cb39eb..9a1aaf4164f 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -64,7 +64,7 @@ print ''; print ''; print ''; -print ''; +print ''; print ''; print "
'; print $langs->trans('PaymentMode'); print 'id.'">'.img_edit($langs->trans('SetMode'),1).'
'.$langs->trans("SearchOrder").'
'; print $langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':

\n"; diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 4a7b61f2768..87c3c7e6dc8 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -237,16 +237,16 @@ if ($user->rights->fournisseur->facture->lire) print "
'; + print ''; $facturestatic->id=$objp->facid; $facturestatic->ref=$objp->ref; print $facturestatic->getNomUrl(1); print "".dol_trunc($objp->ref_supplier,12)."'.dol_trunc($objp->ref_supplier,12)."".dol_print_date($db->jdate($objp->df),'day')."".dol_print_date($db->jdate($objp->datelimite),'day'); + print ''.dol_print_date($db->jdate($objp->df),'day')."'.dol_print_date($db->jdate($objp->datelimite),'day'); if ($objp->datelimite && $db->jdate($objp->datelimite) < ($now - $conf->facture->fournisseur->warning_delay) && ! $objp->paye && $objp->fk_statut == 1) print img_warning($langs->trans("Late")); print "
'.$langs->trans('VATIntra').''; + print '
'.$langs->trans('VATIntra').''; print $object->tva_intra; print '
'; + print '
'; print $langs->trans("Script").''.$file.'
'.$langs->trans("ChoosedMigrateScript").''.$file.'
'.$langs->trans("ChoosedMigrateScript").''.$file.'
'.$langs->trans("ChoosedMigrateScript").' (external modules)'.$modulefileshort.'
'.$langs->trans("ChoosedMigrateScript").' (external modules)'.$modulefileshort.'
'; - print '
'; + print '
'; + print ''; @@ -1091,8 +1091,8 @@ else print ''."\n"; // Barcode value - print '
'; print $langs->trans("BarcodeType"); print ''; if (($action != 'editbarcodetype') && $user->rights->barcode->creer) print 'id.'">'.img_edit($langs->trans('Edit'),1).'
'; - print '
'; + print '
'; + print ''; diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 136e5124ca5..658d87fff0d 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -444,7 +444,7 @@ foreach ($dirmodels as $reldir) print ''; // Show example of numbering module - print ''; print ''; - print ''; + print ''; print "
'; print $langs->trans("BarcodeValue"); print ''; if (($action != 'editbarcode') && $user->rights->barcode->creer) print 'id.'">'.img_edit($langs->trans('Edit'),1).''; + print ''; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) print '
'.$langs->trans($tmp).'
'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index a8a62df999a..3f43e40e43a 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -69,7 +69,7 @@ print ''; print ''; print ''; -print ''; +print ''; print "
'.$langs->trans("SearchAUser").'
'; print $langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':

\n"; print ''; @@ -83,7 +83,7 @@ if ($canreadperms) print '
'.$langs->trans("SearchAGroup").'
'; print $langs->trans("Ref").':
'.$langs->trans("Other").':
'.$langs->trans("Other").':

\n"; print ''; }