diff --git a/build/exe/doliwamp/index.php.install b/build/exe/doliwamp/index.php.install index 1c657b35977..c511d973393 100644 --- a/build/exe/doliwamp/index.php.install +++ b/build/exe/doliwamp/index.php.install @@ -527,7 +527,7 @@ a:hover { -
+'; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index a14509a2aee..d3a62b5a6ab 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -142,11 +142,11 @@ if ($result) { $objp = $db->fetch_object($result); print ''; - print ''; - print ''; diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 246d3752f56..bce4f12e559 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -396,12 +396,12 @@ if ($result) print $product_static->getNomUrl(1); print ''; - print ''; + print ''; if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) { // TODO ADJUST DESCRIPTION SIZE - // print ''; + // print ''; // TODO: we shoul set a user defined value to adjust user square / wide screen size $trunclengh = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION; print ''; @@ -414,7 +414,7 @@ if ($result) print ''; // Current accounting account - print ''; } else { // Accounting account sell - print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totaldebitfield'] == $i) print ''; elseif ($totalarray['totalcreditfield'] == $i) print ''; diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index ca75aaac15e..6995ab4d384 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -203,7 +203,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; - print ''; - print ''; - print ''; - print ''; - print ''; diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index d0ee7579f3b..5e993d43834 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -195,7 +195,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; - print ''; - print ''; print "\n"; } - $var=true; while ($i < $num) { $objp = $db->fetch_object($result); print ''; @@ -543,9 +542,9 @@ if ($action == 'create') { print '"; - // Contrat + // Contract if (! empty($conf->contrat->enabled)) { - $langs->load('contrat'); + $langs->load('contracts'); print ''; print ''; print ''; - // Contrat + // Contract if ($conf->contrat->enabled) { - $langs->load('contrat'); + $langs->load('contracts'); print ''; print '\n"; } - $var=true; $indiceAsked =1; while ($indiceAsked <= $numAsked) { @@ -1192,7 +1191,7 @@ if ($action == 'create') $line->fetch_optionals($object->id,$extralabelslines); $line->array_options = array_merge($line->array_options, $srcLine->array_options); print ''; - print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked); + print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan),$indiceAsked); print ''; } diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index edcd4513c40..9ef8e0da77c 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -791,7 +791,6 @@ if ($resql) print "\n"; $i=0; - $var=true; $totalarray=array(); while ($i < min($num,$limit)) {
@@ -587,4 +587,4 @@ a:hover { EOPAGE; echo $pageContents; -?> \ No newline at end of file +?> diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 1c5e036c78b..ca0de98875f 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -144,9 +144,9 @@ if ($result) $fiscalyearstatic->id = $obj->rowid; print '
' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '' . $obj->label . '' . dol_print_date($db->jdate($obj->date_start), 'day') . '' . dol_print_date($db->jdate($obj->date_end), 'day') . '' . $obj->label . '' . dol_print_date($db->jdate($obj->date_start), 'day') . '' . dol_print_date($db->jdate($obj->date_end), 'day') . '' . $object->getAccountancyEntriesByFiscalYear($obj->date_start, $obj->date_end) . '' . $object->getAccountancyMovementsByFiscalYear($obj->date_start, $obj->date_end) . '' . $fiscalyearstatic->LibStatut($obj->statut, 5) . '
'; + print ''; print $objp->accounting; print ''; + print ''; print ''; print ''.$obj->label.''.$obj->label.'' . $obj->description . '' . $obj->description . '' . nl2br(dol_trunc($obj->description, $trunclengh)) . ''.$product_static->getLibStatut(3, 1).''; + print ''; if ($accounting_product_mode == 'ACCOUNTANCY_BUY') { print length_accountg($obj->accountancy_code_buy); if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount")); @@ -430,7 +430,7 @@ if ($result) $defaultvalue=''; if ($accounting_product_mode == 'ACCOUNTANCY_BUY') { // Accounting account buy - print ''; + print ''; //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code if (empty($defaultvalue)) $defaultvalue=$compta_prodbuy; $codesell=length_accountg($obj->accountancy_code_buy); @@ -439,7 +439,7 @@ if ($result) print ''; + print ''; //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code if (empty($defaultvalue)) $defaultvalue=$compta_prodsell; $codesell=length_accountg($obj->accountancy_code_sell); diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index c8df00f6cdc..4b0ab08d1b1 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -751,8 +751,8 @@ if ($num > 0) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totaldebit']).''.price($totalarray['totalcredit']).''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -280,7 +280,7 @@ if ($resql) { else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php index 837a8c36630..b1187b9a480 100644 --- a/htdocs/accountancy/expensereport/index.php +++ b/htdocs/accountancy/expensereport/index.php @@ -195,7 +195,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -268,7 +268,7 @@ if ($resql) { else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index b328cf73455..d8dd122150c 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -325,7 +325,7 @@ if ($result) { print '' . $codeCompta . ''; + print ''; print img_edit(); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -266,7 +266,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 456c27a4584..187b6fbc3da 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -399,7 +399,6 @@ if ($action == 'create') { print ''.$langs->trans("Duration").'
'.$langs->trans("Description").''.nl2br($object->description)."
'; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 6158848ceed..507155dc54a 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1271,10 +1271,10 @@ else if ($id > 0 || ! empty($ref)) print '
'; diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 2f5f3a41a7e..2fc0ecfab97 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1013,7 +1013,6 @@ if ($action == 'create') print "