Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
This commit is contained in:
Laurent Destailleur
commit
e300bb0611
@ -268,6 +268,7 @@ if ($resql)
|
||||
print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","",$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("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 "</tr>\n";
|
||||
@ -286,7 +287,7 @@ if ($resql)
|
||||
print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$search_montant_ht.'">';
|
||||
print '</td><td class="liste_titre" align="right">';
|
||||
print '<input class="flat" type="text" size="10" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
|
||||
print '</td><td class="liste_titre" colspan="2" align="right">';
|
||||
print '</td><td class="liste_titre" colspan="3" align="right">';
|
||||
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
|
||||
print '</td>';
|
||||
print '<td class="liste_titre" align="center">';
|
||||
@ -354,6 +355,10 @@ if ($resql)
|
||||
print '<td align="right">'.price($objp->total_ht).'</td>';
|
||||
print '<td align="right">'.price($objp->total_ttc).'</td>';
|
||||
print '<td align="right">'.price($objp->am).'</td>';
|
||||
if ($objp->am==0)
|
||||
{ print '<td align="right"></td>'; }
|
||||
else
|
||||
{ print '<td align="right">'.price($objp->total_ttc-$objp->am).'</td>'; }
|
||||
|
||||
// Affiche statut de la facture
|
||||
print '<td align="right" nowrap="nowrap">';
|
||||
|
||||
112
htdocs/install/lib/repair.lib.php
Normal file
112
htdocs/install/lib/repair.lib.php
Normal file
@ -0,0 +1,112 @@
|
||||
<?php
|
||||
/* Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* or see http://www.gnu.org/
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/install/lib/repair.lib.php
|
||||
* \brief Library of repair functions
|
||||
*/
|
||||
|
||||
/**
|
||||
* Check if an element exist
|
||||
*
|
||||
* @param int $id Element id
|
||||
* @param string $table Table of Element
|
||||
*/
|
||||
function checkElementExist($id, $table)
|
||||
{
|
||||
global $db;
|
||||
|
||||
$sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . $table;
|
||||
$sql.= ' WHERE rowid = '.$id;
|
||||
$resql=$db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
$num = $db->num_rows($resql);
|
||||
if ($num > 0) return true;
|
||||
else return false;
|
||||
}
|
||||
else return true; // for security
|
||||
}
|
||||
|
||||
/**
|
||||
* Check linked elements and delete if invalid
|
||||
*
|
||||
* @param string $sourcetype Source element type
|
||||
* @param string $targettype Target element type
|
||||
* @return string
|
||||
*/
|
||||
function checkLinkedElements($sourcetype, $targettype)
|
||||
{
|
||||
global $db, $langs;
|
||||
|
||||
$elements=array();
|
||||
$deleted=0;
|
||||
|
||||
$sourcetable=$sourcetype;
|
||||
$targettable=$targettype;
|
||||
|
||||
if ($sourcetype == 'shipping') $sourcetable = 'expedition';
|
||||
else if ($targettype == 'shipping') $targettable = 'expedition';
|
||||
if ($sourcetype == 'delivery') $sourcetable = 'livraison';
|
||||
else if ($targettype == 'delivery') $targettable = 'livraison';
|
||||
if ($sourcetype == 'order_supplier') $sourcetable = 'commande_fournisseur';
|
||||
else if ($targettype == 'order_supplier') $targettable = 'commande_fournisseur';
|
||||
if ($sourcetype == 'invoice_supplier') $sourcetable = 'facture_fourn';
|
||||
else if ($targettype == 'invoice_supplier') $targettable = 'facture_fourn';
|
||||
|
||||
$out = $langs->trans('SourceType').': '.$sourcetype.' => '.$langs->trans('TargetType').': '.$targettype.' ';
|
||||
|
||||
$sql = 'SELECT * FROM '.MAIN_DB_PREFIX .'element_element';
|
||||
$sql.= ' WHERE sourcetype="'.$sourcetype.'" AND targettype="'.$targettype.'"';
|
||||
$resql=$db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
$num = $db->num_rows($resql);
|
||||
if ($num)
|
||||
{
|
||||
$i = 0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$obj = $db->fetch_object($resql);
|
||||
$elements[$obj->rowid]=array($sourcetype => $obj->fk_source, $targettype => $obj->fk_target);
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (! empty($elements))
|
||||
{
|
||||
foreach($elements as $key => $element)
|
||||
{
|
||||
if (! checkElementExist($element[$sourcetype], $sourcetable) || ! checkElementExist($element[$targettype], $targettable))
|
||||
{
|
||||
$sql = 'DELETE FROM '.MAIN_DB_PREFIX .'element_element';
|
||||
$sql.= ' WHERE rowid = '.$key;
|
||||
$resql=$db->query($sql);
|
||||
$deleted++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($deleted) $out.= '('.$langs->trans('LinkedElementsInvalidDeleted', $deleted).')<br>';
|
||||
else $out.= '('.$langs->trans('NothingToDelete').')<br>';
|
||||
|
||||
return $out;
|
||||
}
|
||||
|
||||
?>
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -26,7 +26,7 @@ include_once("./inc.php");
|
||||
if (file_exists($conffile)) include_once($conffile);
|
||||
require_once($dolibarr_main_document_root."/core/lib/admin.lib.php");
|
||||
require_once($dolibarr_main_document_root."/core/class/extrafields.class.php");
|
||||
|
||||
require_once("lib/repair.lib.php");
|
||||
|
||||
$grant_query='';
|
||||
$etape = 2;
|
||||
@ -262,6 +262,29 @@ foreach($listofmodulesextra as $tablename => $elementtype)
|
||||
}
|
||||
|
||||
|
||||
// Check and clean linked elements
|
||||
if (GETPOST('clean_linked_elements'))
|
||||
{
|
||||
// propal => order
|
||||
print "</td><td>".checkLinkedElements('propal', 'commande')."</td></tr>\n";
|
||||
|
||||
// propal => invoice
|
||||
print "</td><td>".checkLinkedElements('propal', 'facture')."</td></tr>\n";
|
||||
|
||||
// order => invoice
|
||||
print "</td><td>".checkLinkedElements('commande', 'facture')."</td></tr>\n";
|
||||
|
||||
// order => shipping
|
||||
print "</td><td>".checkLinkedElements('commande', 'shipping')."</td></tr>\n";
|
||||
|
||||
// shipping => delivery
|
||||
print "</td><td>".checkLinkedElements('shipping', 'delivery')."</td></tr>\n";
|
||||
|
||||
// order_supplier => invoice_supplier
|
||||
print "</td><td>".checkLinkedElements('order_supplier', 'invoice_supplier')."</td></tr>\n";
|
||||
}
|
||||
|
||||
|
||||
// Run purge of directory
|
||||
if (GETPOST('purge'))
|
||||
{
|
||||
|
||||
@ -155,7 +155,10 @@ MigrationShippingDelivery2=Mise à jour stockage des expéditions 2
|
||||
MigrationFinished=Migration terminée
|
||||
LastStepDesc=<strong>Dernière étape</strong>: Définissez ici le compte et mot de passe du premier utilisateur que vous allez utiliser pour vous connecter à l'application. Ne perdez pas ces identifiants, il s'agit du compte permettant d'administrer les autres.
|
||||
ActivateModule=Activation du module %s
|
||||
|
||||
LinkedElementsInvalidDeleted=<b>%s</b> liaisons invalides ont été supprimées
|
||||
NothingToDelete=Aucune liaison invalide trouvée
|
||||
SourceType=Source
|
||||
TargetType=Cible
|
||||
|
||||
#########
|
||||
# upgrade
|
||||
|
||||
Loading…
Reference in New Issue
Block a user