diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 6cec4a52bb9..a56e8ad6def 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -252,7 +252,7 @@ print ''; //ADDDAYS print ''.$langs->trans("ADDDAYS").''; -print ''; +print ''; if (! $conf->global->PRELEVEMENT_ADDDAYS) $conf->global->PRELEVEMENT_ADDDAYS=0; print ''; print ''; diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 853c2ee4a0e..b117c948d69 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -97,7 +97,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode //if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."
\n"; if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."
\n"; $texte.= ''; - $texte.= '  '; + $texte.= '  '; $texte.= ''; $texte.= ''; diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index 7ffc60815e6..3ff973c586d 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -48,7 +48,7 @@ foreach($linkedObjectBlock as $key => $objectlink) trans("SupplierOrder"); ?> trans("ShowOrder"),"order").' '.$objectlink->ref; ?> - ref_supplier; ?> + ref_supplier; ?> date,'day'); ?> rights->fournisseur->commande->lire) { diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index 324e6b8dccf..dac4780a2d7 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -50,7 +50,7 @@ foreach($linkedObjectBlock as $key => $objectlink) trans("SupplierInvoice"); ?> trans("ShowBill"),"bill").' '.$objectlink->ref; ?> - ref_supplier; ?> + ref_supplier; ?> date,'day'); ?> rights->fournisseur->facture->lire) { diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index 5356d212c38..9a22c93d042 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -40,8 +40,8 @@ class FormProduct public $error=''; // Cache arrays - var $cache_warehouses=array(); - var $cache_lot=array(); + public $cache_warehouses=array(); + public $cache_lot=array(); /** @@ -266,7 +266,7 @@ class FormProduct print ''; print $this->selectWarehouses($selected, $htmlname, '', $addempty); print ''; - print ''; + print ''; print ''; } else { if ($selected) { diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 08459729e87..9605137b838 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -796,14 +796,14 @@ SCRIPT; print ''.$productfourn->getSocNomUrl(1,'supplier').''; // Supplier ref - print ''.$productfourn->fourn_ref.''; + print ''.$productfourn->fourn_ref.''; // Availability if(!empty($conf->global->FOURN_PRODUCT_AVAILABILITY)) { $form->load_cache_availability(); $availability= $form->cache_availability[$productfourn->fk_availability]['label']; - print ''.$availability.''; + print ''.$availability.''; } // Quantity diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index 95bb82aea50..4e56e16c2de 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -491,8 +491,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } else print ''; } diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php index 0b89ac8a647..37d6fa5c670 100644 --- a/htdocs/product/inventory/tpl/inventory.tpl.php +++ b/htdocs/product/inventory/tpl/inventory.tpl.php @@ -123,7 +123,7 @@ if (empty($conf) || ! is_object($conf)) } // Fin IF principal ?> -    +    barcode->enabled)) { ?> diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 92975883cbb..c77037abe51 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1,12 +1,12 @@ +/* Copyright (C) 2001-2007 Rodolphe Quiedeville * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005 Eric Seigne * Copyright (C) 2005-2017 Regis Houssin - * Copyright (C) 2006 Andre Cianfarani + * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2014 Florian Henry * Copyright (C) 2014-2018 Juanjo Menent - * Copyright (C) 2014-2018 Philippe Grand + * Copyright (C) 2014-2019 Philippe Grand * Copyright (C) 2014 Ion agorria * Copyright (C) 2015 Alexandre Spangaro * Copyright (C) 2015 Marcos García @@ -1395,7 +1395,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) } if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { - print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().''; + print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().''; } print ''; @@ -1710,7 +1710,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) } if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { - print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().''; + print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().''; } print ''; @@ -1801,7 +1801,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print ''; if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { - print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().''; + print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().''; } print ''; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 083dcd6ea52..1155ca518e9 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -238,8 +238,8 @@ if ($id > 0 || ! empty($ref)) } } print ''; - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; print ''; print ''.$total_qty.''; print ''.price($total_ht).''; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 21bb3f6fd9a..eb3bd095065 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -246,8 +246,8 @@ if ($id > 0 || ! empty($ref)) { } } print ''; - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; print ''; print '' . $total_qty . ''; print '' . price($total_ht) . ''; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 6cf8c13208a..cd7454cac15 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -259,8 +259,8 @@ if ($id > 0 || ! empty($ref)) } } print ''; - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; print ''; print ''.$total_qty.''; print ''.price($total_ht).''; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 95bea4650c4..19fa57d50c9 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -244,8 +244,8 @@ if ($id > 0 || ! empty($ref)) } } print ''; - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; print ''; print '' . $total_qty . ''; print '' . price($total_ht) . ''; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 1c2d0f56e3c..9d832f4d336 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -242,8 +242,8 @@ if ($id > 0 || ! empty($ref)) } print ''; - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; print ''; print '' . $total_qty . ''; print '' . price($total_ht) . ''; diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php index 55cafd034cf..a67420a57ea 100644 --- a/htdocs/product/stats/supplier_proposal.php +++ b/htdocs/product/stats/supplier_proposal.php @@ -241,8 +241,8 @@ if ($id > 0 || ! empty($ref)) } print ''; - if ($num < $limit) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; print ''; print '' . $total_qty . ''; print '' . price($total_ht) . ''; diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index 6de8be264a9..7f0b5dc7210 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -511,8 +511,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).''; elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 5daa37a6465..96b21b09bf9 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -674,7 +674,7 @@ foreach ($listofreferent as $key => $value) print ''; // Module - print ''.$name.''; + print ''.$name.''; // Nb print ''.$i.''; // Amount HT @@ -968,7 +968,7 @@ foreach ($listofreferent as $key => $value) print ''; // Third party or user - print ''; + print ''; if (is_object($element->thirdparty)) print $element->thirdparty->getNomUrl(1,'',48); else if ($tablename == 'expensereport_det') { diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index e36a000674b..252942ced6c 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -807,7 +807,7 @@ while ($i < min($num,$limit)) // Visibility if (! empty($arrayfields['p.public']['checked'])) { - print ''; + print ''; if ($obj->public) print $langs->trans('SharedProject'); else print $langs->trans('PrivateProject'); print ''; @@ -922,8 +922,8 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield'] $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totaloppfield'] == $i) print ''.price($totalarray['totalopp'], 1, $langs, 1, -1, -1).''; elseif ($totalarray['totalbudgetfield'] == $i) print ''.price($totalarray['totalbudget'], 1, $langs, 1, -1, -1).''; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index e6de0743d66..bca42466044 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -447,13 +447,13 @@ if ($id > 0 || ! empty($ref)) print ''; // Source - print ''; + print ''; if ($tab[$i]['source']=='internal') print $langs->trans("User"); if ($tab[$i]['source']=='external') print $langs->trans("ThirdPartyContact"); print ''; // Societe - print ''; + print ''; if ($tab[$i]['socid'] > 0) { $companystatic->fetch($tab[$i]['socid']); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index e1a77f0b824..61ae1ce652e 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -818,8 +818,8 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).''; elseif ($totalarray['totaldurationeffectivefield'] == $i) print ''.convertSecondToTime($totalarray['totaldurationeffective'],$timespentoutputformat).''; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index e2b00923eef..90c7434a42a 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1105,7 +1105,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Note if (! empty($arrayfields['t.note']['checked'])) { - print ''; + print ''; if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) { print ''; @@ -1320,7 +1320,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Note if (! empty($arrayfields['t.note']['checked'])) { - print ''; + print ''; if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { print ''; @@ -1468,7 +1468,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Note if (! empty($arrayfields['t.note']['checked'])) { - print ''; + print ''; if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) { print ''; @@ -1548,8 +1548,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; - else print ''.$langs->trans("Totalforthispage").''; + if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; + else print ''.$langs->trans("Totalforthispage").''; } elseif ($totalarray['totaldurationfield'] == $i) print ''.convertSecondToTime($totalarray['totalduration'],'allhourmin').''; elseif ($totalarray['totalvaluefield'] == $i) print ''.price($totalarray['totalvalue']).''; diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 2fc0ecfab97..90082d638c2 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1002,13 +1002,13 @@ if ($action == 'create') print ''; if (! empty($conf->stock->enabled)) { - print ''.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')'; + print ''.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')'; } if (!empty($conf->productbatch->enabled)) { - print ''.$langs->trans("batch_number").''; - print ''.$langs->trans("EatByDate").''; - print ''.$langs->trans("SellByDate").''; + print ''.$langs->trans("batch_number").''; + print ''.$langs->trans("EatByDate").''; + print ''.$langs->trans("SellByDate").''; } print "\n"; } @@ -1139,7 +1139,7 @@ if ($action == 'create') // Stock if (! empty($conf->stock->enabled)) { - print ''; + print ''; if ($line->product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) // Type of product need stock change ? { // Show warehouse combo list @@ -1687,12 +1687,12 @@ else if ($id || $ref) } if (! empty($conf->stock->enabled)) { - print ''.$langs->trans("WarehouseSource").''; + print ''.$langs->trans("WarehouseSource").''; } if (! empty($conf->productbatch->enabled)) { - print ''.$langs->trans("Batch").''; + print ''.$langs->trans("Batch").''; } } print ''.$langs->trans("CalculatedWeight").''; @@ -1919,7 +1919,7 @@ else if ($id || $ref) // Warehouse source if (! empty($conf->stock->enabled)) { - print ''; + print ''; if ($lines[$i]->fk_entrepot > 0) { diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php index ae8a493f805..a598b0503e0 100644 --- a/htdocs/reception/stats/index.php +++ b/htdocs/reception/stats/index.php @@ -239,17 +239,17 @@ print '
'; print ''; print ''; // Company - print ''; // User - print ''; // Year - print ''; if($action == 'editRE') { - print ''; } @@ -2352,7 +2352,7 @@ else print ''; print ''; if($action == 'editIRPF'){ - print ''; }else{ @@ -2373,7 +2373,7 @@ else print ''; print ''; if($action == 'editRE'){ - print ''; }else{ @@ -2395,7 +2395,7 @@ else print ''; print ''; if($action == 'editIRPF'){ - print ''; }else{ diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 580314dbf1d..dd4134bae86 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -594,7 +594,7 @@ if ($sql_select) */ print ''; - //print ''; + //print ''; print ''; $total_qty+=$objp->prod_qty; diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 032ece6f4c4..ce09d4434ed 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -501,8 +501,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''; - else print ''; + if ($num < $limit) print ''; + else print ''; } else print ''; } diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php index 3fa019ac4df..883d6ce8c10 100644 --- a/htdocs/stripe/payment.php +++ b/htdocs/stripe/payment.php @@ -618,10 +618,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print '
'.$langs->trans("Filter").'
'.$langs->trans("ThirdParty").''; + print '
'.$langs->trans("ThirdParty").''; if ($mode == 'customer') $filter='s.client in (1,2,3)'; if ($mode == 'supplier') $filter='s.fournisseur = 1'; 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("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/societe/card.php b/htdocs/societe/card.php index c6dd6266035..617e9f9a1f7 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -10,7 +10,7 @@ * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2015 Marcos García * Copyright (C) 2015 Raphaël Doursenaud - * Copyright (C) 2018 Nicolas ZABOURI + * Copyright (C) 2018 Nicolas ZABOURI * Copyright (C) 2018 Ferran Marcet * Copyright (C) 2018 Frédéric France * @@ -2335,7 +2335,7 @@ else print '
'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).''; + print ''; $formcompany->select_localtax(1,$object->localtax1_value, "lt1"); print '
'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).''; + print ''; $formcompany->select_localtax(2,$object->localtax2_value, "lt2"); print '
'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).''; + print ''; $formcompany->select_localtax(1,$object->localtax1_value, "lt1"); print '
'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).''; + print ''; $formcompany->select_localtax(2,$object->localtax2_value, "lt2"); print ''.$prodreftxt.''.$prodreftxt.''.$objp->prod_qty.''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").'
'."\n"; // Titles with sort buttons print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print "\n"; foreach ($customerstripe->sources->data as $src) { print ''; diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 4e82c939b96..0affce21c93 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -6,7 +6,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2010-2011 Philippe Grand + * Copyright (C) 2010-2019 Philippe Grand * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2014 Ferran Marcet @@ -1736,7 +1736,7 @@ if ($action == 'create') if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= '

'.$langs->trans('SupplierProposalRefFournNotice').'

'; // TODO Suggest a permanent checkbox instead of option $form_close .= ''; $form_close .= '
'.$langs->trans('Type').''.$langs->trans('Informations').''.$langs->trans('Type').''.$langs->trans('Informations').'
'; - $form_close .= ''; - $form_close .= ''; $form_close .= ''."\n"; + print ''."\n"; print ''."\n"; diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 1fe96bc4def..3fb0056dfa1 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -6,7 +6,7 @@ * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2011 Juanjo Menent - * Copyright (C) 2010-2011 Philippe Grand + * Copyright (C) 2010-2019 Philippe Grand * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2016 Ferran Marcet @@ -842,8 +842,8 @@ if ($resql) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totalhtfield'] == $i) print ''; elseif ($totalarray['totalvatfield'] == $i) print ''; diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 7ed220d1787..7c9e6e81c2b 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -270,7 +270,7 @@ print ''; print "\n"; $url='https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html'; -print ''; +print ''; print ''; print ''; print ''; @@ -287,7 +287,7 @@ print ''; print "\n"; $url='http://www.takepos.com'; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 68f01707d58..fd81b3cbadb 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -444,7 +444,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd // Progression print '
' . $langs->trans("CloseAs") . ''; + $form_close .= '
' . $langs->trans("CloseAs") . ''; $form_close .= ''; $form_close .= ''; $form_close .= '
' . $langs->trans('Note') . '
'; diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 2eb2fb05032..82f5ad56416 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -346,7 +346,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos $companystatic->name=$obj->socname; $companystatic->client=$obj->client; $companystatic->canvas=$obj->canvas; - print ''.$companystatic->getNomUrl(1,'customer',44).''.$companystatic->getNomUrl(1,'customer',44).''; print dol_print_date($db->jdate($obj->dp),'day').''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totalht']).''.price($totalarray['totalvat']).'
TakePOS for mobile devices'.$url.'
TakePOS original developers'.$url.'
'; print ''; if ($action != 'progression' && $object->fk_statut < 8 && !$user->societe_id) { print ''; diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php index f89dd82cbca..b8d5cbad454 100644 --- a/htdocs/ticket/index.php +++ b/htdocs/ticket/index.php @@ -327,7 +327,7 @@ if ($result) { print "\n"; // Creation date - print '"; diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 64ec859cc0c..d0d60df5e1f 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -672,8 +672,8 @@ if (isset($totalarray['pos'])) { if ($i == 1) { - if ($num < $limit) print ''; - else print ''; + if ($num < $limit) print ''; + else print ''; } else print ''; } diff --git a/htdocs/user/home.php b/htdocs/user/home.php index da31b6027ed..fb97549e9a1 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -161,7 +161,7 @@ if ($resql) print img_picto($langs->trans("Administrator"),'star'); } print ""; - print ''; + print ''; print "'; print '
'; - print $langs->trans('Progression') . ''; + print $langs->trans('Progression') . ''; print '' . img_edit($langs->trans('Modify')) . ''; + print ''; print dol_print_date($db->jdate($objp->datec), 'dayhour'); print "'.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$obj->login.''.$obj->login.'"; if ($obj->fk_soc) { diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php index c135e33016c..e8468d64ece 100755 --- a/scripts/accountancy/export-thirdpartyaccount.php +++ b/scripts/accountancy/export-thirdpartyaccount.php @@ -188,16 +188,16 @@ if ($resql) { print '
'; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; while ($obj = $db->fetch_object($resql)) { @@ -210,15 +210,15 @@ if ($resql) { $thirdpartystatic->status = $obj->status; print $thirdpartystatic->getNomUrl(1); print ''; - print '' . "\n"; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print '' . "\n"; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print "\n"; $i ++;
' . $langs->trans("ThirdParties") . '' . $langs->trans("AccountNumber") . '' . $langs->trans("RaisonSociale") . '' . $langs->trans("Address") . '' . $langs->trans("Zip") . '' . $langs->trans("Town") . '' . $langs->trans("Country") . '' . $langs->trans("Contact") . '' . $langs->trans("Phone") . '' . $langs->trans("Fax") . '
' . $langs->trans("ThirdParties") . '' . $langs->trans("AccountNumber") . '' . $langs->trans("RaisonSociale") . '' . $langs->trans("Address") . '' . $langs->trans("Zip") . '' . $langs->trans("Town") . '' . $langs->trans("Country") . '' . $langs->trans("Contact") . '' . $langs->trans("Phone") . '' . $langs->trans("Fax") . '
' . $obj->compta . '' . $obj->address . '' . $obj->zip . '' . $obj->town . '' . $obj->country . '' . $obj->phone . '' . $obj->fax . '' . $obj->compta . '' . $obj->address . '' . $obj->zip . '' . $obj->town . '' . $obj->country . '' . $obj->phone . '' . $obj->fax . '