diff --git a/build/debian/control b/build/debian/control
index 8810a7d189c..3fb705087a8 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -13,7 +13,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
libphp-adodb,
libnusoap-php,
libphp-pclzip,
- libfpdi-php, libfpdf-tpl-php, php-fpdf
+ libfpdi-php, libfpdf-tpl-php, php-fpdf,
libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
ttf-dejavu-core,
xdg-utils,
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 470dfa56ba3..d2dbceea47f 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -283,7 +283,7 @@ if ($resql)
print_liste_field_titre($langs->trans("Taxes"),$_SERVER["PHP_SELF"],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder);
- //print_liste_field_titre($langs->trans("Remain"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Rest"),$_SERVER["PHP_SELF"],"am","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye,am","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Merge"),$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder);
print "\n";
@@ -300,7 +300,9 @@ if ($resql)
print '
| ';
print ' | ';
print ' | ';
- print '';
+ print ' | | ';
+ print ' | ';
+ print '';
print '';
print ' | ';
print '';
@@ -382,7 +384,7 @@ if ($resql)
print ' | ';
// Remain to receive
- //print ''.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):' ').' | ';
+ print ''.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):' ').' | ';
// Status of invoice
print '';
@@ -412,7 +414,7 @@ if ($resql)
print ' | '.price($total_tva).' | ';
print ''.price($total_ttc).' | ';
print ''.price($total_paid).' | ';
- print ' | ';
+ print ''.price($total_ttc - $total_paid).' | ';
print ' | ';
print "\n";
}
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index 8c55161ca73..e93113e028c 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -367,8 +367,8 @@ if ($action == 'new')
$sql.= " AND ba.entity = ".$conf->entity;
$sql.= " AND b.fk_bordereau = 0";
$sql.= " AND b.amount > 0";
- if ($filterdate) $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
- if ($filteraccountid) $sql.=" AND ba.rowid= '".$filteraccountid."'";
+ if ($filterdate) $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
+ if ($filteraccountid > 0) $sql.=" AND ba.rowid= '".$filteraccountid."'";
$sql.= $db->order("b.dateo,b.rowid","ASC");
$resql = $db->query($sql);
@@ -651,10 +651,10 @@ else
print '';
-if ($user->societe_id == 0 && count($accounts) == 1 && $action == 'new' && $user->rights->banque->cheque)
+/*if ($user->societe_id == 0 && count($accounts) == 1 && $action == 'new' && $user->rights->banque->cheque)
{
print '
'.$langs->trans('NewCheckReceipt').'';
-}
+}*/
if ($user->societe_id == 0 && ! empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
{
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 081204415b2..a8a4099004a 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -82,7 +82,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
$result=include_once $conffile; // Load conf file
if ($result)
{
- if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility
+ if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysqli'; // For backward compatibility
// Clean parameters
$dolibarr_main_data_root =isset($dolibarr_main_data_root)?trim($dolibarr_main_data_root):'';