فهرست منبع

Fix responsive

Laurent Destailleur 3 سال پیش
والد
کامیت
a6ddc90d5b

+ 10 - 4
htdocs/comm/index.php

@@ -106,10 +106,16 @@ print load_fiche_titre($langs->trans("CommercialArea"), '', 'commercial');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-print getCustomerProposalPieChart($socid);
-print '<br>';
-print getCustomerOrderPieChart($socid);
-print '<br>';
+$tmp = getCustomerProposalPieChart($socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
+$tmp = getCustomerOrderPieChart($socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
 
 /*
  * Draft customer proposals

+ 5 - 2
htdocs/comm/propal/index.php

@@ -67,8 +67,11 @@ print load_fiche_titre($langs->trans("ProspectionArea"), '', 'propal');
 print '<div class="fichecenter">';
 print '<div class="fichethirdleft">';
 
-print getCustomerProposalPieChart($socid);
-print '<br>';
+$tmp = getCustomerProposalPieChart($socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
 
 /*
  * Draft proposals

+ 5 - 2
htdocs/commande/index.php

@@ -77,8 +77,11 @@ print load_fiche_titre($langs->trans("OrdersArea"), '', 'order');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-print getCustomerOrderPieChart($socid);
-print '<br>';
+$tmp = getCustomerOrderPieChart($socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
 
 
 /*

+ 21 - 7
htdocs/compta/facture/index.php

@@ -59,19 +59,33 @@ print load_fiche_titre($langs->trans("CustomersInvoicesArea"), '', 'bill');
 print '<div class="fichecenter">';
 
 print '<div class="fichethirdleft">';
-print getNumberInvoicesPieChart('customers');
-//print getCustomerInvoicePieChart($socid);
-print '<br>';
-print getCustomerInvoiceDraftTable($max, $socid);
+$tmp = getNumberInvoicesPieChart('customers');
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
+$tmp = getCustomerInvoiceDraftTable($max, $socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
 
 print '</div>';
 
 print '<div class="fichetwothirdright">';
 print '<div class="ficheaddleft">';
 
-print getCustomerInvoiceLatestEditTable($maxLatestEditCount, $socid);
-print '<br>';
-print getCustomerInvoiceUnpaidOpenTable($max, $socid);
+$tmp = getCustomerInvoiceLatestEditTable($maxLatestEditCount, $socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
+
+$tmp = getCustomerInvoiceUnpaidOpenTable($max, $socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
 
 print '</div>';
 print '</div>';

+ 21 - 9
htdocs/core/lib/invoice.lib.php

@@ -679,7 +679,8 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				$result .= '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
+				$result .= '<tr class="oddeven">';
+				$result .= '<td class="nowrap tdoverflowmax100">';
 				$result .= $tmpinvoice->getNomUrl(1, '');
 				$result .= '</td>';
 				$result .= '<td class="nowrap tdoverflowmax100">';
@@ -807,7 +808,8 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				$result .= '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
+				$result .= '<tr class="oddeven">';
+				$result .= '<td class="nowrap tdoverflowmax100">';
 				$result .= $facturesupplierstatic->getNomUrl(1, '');
 				$result .= '</td>';
 				$result .= '<td class="nowrap tdoverflowmax100">';
@@ -883,7 +885,9 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	$result .= '<table class="noborder centpercent">';
 
 	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="4">'.$langs->trans("LastCustomersBills", $maxCount).'</td>';
+	$result .= '<th colspan="3">'.$langs->trans("LastCustomersBills", $maxCount).'</th>';
+	$result .= '<th class="right">'.$langs->trans("AmountTTC").'</th>';
+	$result .= '<th class="right"></th>';
 	$result .= '</tr>';
 
 	if ($num < 1) {
@@ -917,7 +921,7 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 		$filename = dol_sanitizeFileName($obj->ref);
 		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
 
-		$result .= '<tr width="20%" class="nowrap">';
+		$result .= '<tr class="nowrap">';
 
 		$result .= '<td class="oddeven">';
 		$result .= '<table class="nobordernopadding">';
@@ -931,8 +935,9 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 		$result .= '</table>';
 		$result .= '</td>';
 
-		$result .= '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
+		$result .= '<td class="tdoverflowmax150">'.$companystatic->getNomUrl(1, 'customer').'</td>';
 		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+		$result .= '<td class="right amount">'.price($obj->total_ttc).'</td>';
 		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
 
 		$result .= '</tr>';
@@ -985,7 +990,9 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	$result = '<div class="div-table-responsive-no-min">';
 	$result .= '<table class="noborder centpercent">';
 	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="4">'.$langs->trans("BoxTitleLastSupplierBills", $maxCount).'</td>';
+	$result .= '<th colspan="3">'.$langs->trans("BoxTitleLastSupplierBills", $maxCount).'</th>';
+	$result .= '<th class="right">'.$langs->trans("AmountTTC").'</th>';
+	$result .= '<th class="right"></th>';
 	$result .= '</tr>';
 
 	if ($num < 1) {
@@ -1019,7 +1026,7 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 		$filename = dol_sanitizeFileName($obj->ref);
 		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
 
-		$result .= '<tr width="20%" class="nowrap">';
+		$result .= '<tr class="nowrap">';
 
 		$result .= '<td class="oddeven">';
 		$result .= '<table class="nobordernopadding">';
@@ -1033,8 +1040,12 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 		$result .= '</table>';
 		$result .= '</td>';
 
-		$result .= '<td>'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+		$result .= '<td class="tdoverflowmax150">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+
 		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+
+		$result .= '<td class="amount right">'.price($obj->total_ttc).'</td>';
+
 		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
 
 		$result .= '</tr>';
@@ -1341,7 +1352,8 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 					$societestatic->code_compta = $obj->code_compta;
 					$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-					print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
+					print '<tr class="oddeven">';
+					print '<td class="nowrap tdoverflowmax100">';
 					print $facstatic->getNomUrl(1, '');
 					print '</td>';
 					print '<td class="nowrap tdoverflowmax100">'.$societestatic->getNomUrl(1, 'supplier').'</td>';

+ 6 - 6
htdocs/don/index.php

@@ -174,8 +174,8 @@ foreach ($listofstatus as $status) {
 	print '<tr class="oddeven">';
 	print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
 	print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
-	print '<td class="right">'.(!empty($nb[$status]) ?price($somme[$status], 'MT') : '&nbsp;').'</td>';
-	print '<td class="right">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
+	print '<td class="right nowraponall amount">'.(!empty($nb[$status]) ? price($somme[$status], 'MT') : '&nbsp;').'</td>';
+	print '<td class="right nowraponall">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
 	$totalnb += (!empty($nb[$status]) ? $nb[$status] : 0);
 	$total += (!empty($somme[$status]) ? $somme[$status] : 0);
 	print "</tr>";
@@ -183,9 +183,9 @@ foreach ($listofstatus as $status) {
 
 print '<tr class="liste_total">';
 print '<td>'.$langs->trans("Total").'</td>';
-print '<td class="right">'.$totalnb.'</td>';
-print '<td class="right">'.price($total, 'MT').'</td>';
-print '<td class="right">'.($totalnb ?price(price2num($total / $totalnb, 'MT')) : '&nbsp;').'</td>';
+print '<td class="right nowraponall">'.$totalnb.'</td>';
+print '<td class="right nowraponall">'.price($total, 'MT').'</td>';
+print '<td class="right nowraponall">'.($totalnb ?price(price2num($total / $totalnb, 'MT')) : '&nbsp;').'</td>';
 print '</tr>';
 print "</table>";
 
@@ -233,7 +233,7 @@ if ($resql) {
 			print dolGetFirstLastname($obj->lastname, $obj->firstname);
 			print '</td>';
 
-			print '<td class="right nobordernopadding">';
+			print '<td class="right nobordernopadding nowraponall amount">';
 			print price($obj->amount, 1);
 			print '</td>';
 

+ 22 - 7
htdocs/fourn/facture/index.php

@@ -58,19 +58,34 @@ print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'supplier_invo
 print '<div class="fichecenter">';
 
 print '<div class="fichethirdleft">';
-print getNumberInvoicesPieChart('suppliers');
-//print getPurchaseInvoicePieChart($socid);
-print '<br>';
-print getDraftSupplierTable($maxDraftCount, $socid);
+$tmp = getNumberInvoicesPieChart('suppliers');
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
+
+$tmp = getDraftSupplierTable($maxDraftCount, $socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
 
 print '</div>';
 
 print '<div class="fichetwothirdright">';
 print '<div class="ficheaddleft">';
 
-print getPurchaseInvoiceLatestEditTable($maxLatestEditCount, $socid);
-print '<br>';
-print getPurchaseInvoiceUnpaidOpenTable($max, $socid);
+$tmp = getPurchaseInvoiceLatestEditTable($maxLatestEditCount, $socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
+
+$tmp = getPurchaseInvoiceUnpaidOpenTable($max, $socid);
+if ($tmp) {
+	print $tmp;
+	print '<br>';
+}
 
 print '</div>';
 print '</div>';

+ 1 - 1
htdocs/societe/consumption.php

@@ -384,7 +384,7 @@ if (empty($elementTypeArray) && !$object->client && !$object->fournisseur) {
 
 // Define type of elements
 $typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPOST('type_element'), $showempty, 0, 0, '', 0, 0, $disabled, '', 'maxwidth150onsmartphone');
-$button = '<input type="submit" class="button buttonform" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+$button = '<input type="submit" class="button buttonform small" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
 $param = '';
 $param .= "&sref=".urlencode($sref);