lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Clean awful code

Browse Source
This commit is contained in:
Laurent Destailleur 2013-09-23 12:31:10 +02:00
parent 7ed5d5e543
commit 5341811ec0
2 changed files with 56 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
htdocs/compta/facture.php
View File

@ -1588,6 +1588,15 @@ else if ($action == 'down' && $user->rights->facture->creer)
exit; exit;
} }
// Link invoice to order
if (GETPOST('linkedOrder'))
{
$object->fetch($id);
$object->fetch_thirdparty();
$result=$object->add_object_linked('commande',GETPOST('linkedOrder'));
}
/* /*
* Add file in email form * Add file in email form
*/ */
@ -1960,6 +1969,16 @@ $now=dol_now();
llxHeader('',$langs->trans('Bill'),'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes'); llxHeader('',$langs->trans('Bill'),'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
print '
<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
jQuery("#linktoorder").click(function() {
jQuery("#commande").toggle();
});
});
</script>
';
/********************************************************************* /*********************************************************************
* *
@ -3727,74 +3746,64 @@ else if ($id > 0 || ! empty($ref))
// Linked object block // Linked object block
$somethingshown=$object->showLinkedObjectBlock(); $somethingshown=$object->showLinkedObjectBlock();
if (empty($somethingshown) && $object->statut > 0) if (empty($somethingshown) && $object->statut > 0)
{ {
print '<br><a href="#" id="linktoorder">'.$langs->trans('LinkedOrder').'</a>';
print '<a href="#" onClick="lier_commande(commande)">'.$langs->trans('LinkedOrder').'</a>'; print '<div id="commande" style="display:none">';
print '<div id="commande" style="display:none">';
{
$sql = "SELECT s.rowid as socid, s.nom as name, s.client, c.rowid, c.ref, c.ref_client, c.total_ht"; $sql = "SELECT s.rowid as socid, s.nom as name, s.client, c.rowid, c.ref, c.ref_client, c.total_ht";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."commande as c";
$sql.= ' WHERE c.fk_soc = '.$soc->id.''; $sql.= ' WHERE c.fk_soc = '.$soc->id.'';
$result = $db->query($sql); $resqlorderlist = $db->query($sql);
if ($result) if ($resqlorderlist)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($resqlorderlist);
$i = 0; $i = 0;
print '<form action="" method="POST" name="LinkedOrder">';
print_titre($langs->trans("LinkedOrder")); print '<table class="noborder">';
print '<table><tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="nowrap"></td>'; print '<td class="nowrap"></td>';
print '<td align="center">'.$langs->trans("Ref").'</td>'; print '<td align="center">'.$langs->trans("Ref").'</td>';
print '<td align="left">'.$langs->trans("RefCustomer").'</td>'; print '<td align="left">'.$langs->trans("RefCustomer").'</td>';
print '<td align="left">'.$langs->trans("AmountHTShort").'</td>'; print '<td align="left">'.$langs->trans("AmountHTShort").'</td>';
print '<td align="left">'.$langs->trans("Company").'</td> print '<td align="left">'.$langs->trans("Company").'</td>';
</tr>'; print '</tr>';
print '<form action=" " method="post" name="LinkedOrder">';
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($resqlorderlist);
if ($objp->socid == $soc->id) if ($objp->socid == $soc->id)
{ {
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td aling="left">'; print '<td aling="left">';
print '<input type="radio" name="linkedOrder" value='.$objp->rowid.'>'; print '<input type="radio" name="linkedOrder" value='.$objp->rowid.'>';
print '<td align="center">'.$objp->ref.'</td>'; print '<td align="center">'.$objp->ref.'</td>';
print '<td>'.$objp->ref_client.'</td>'; print '<td>'.$objp->ref_client.'</td>';
print '<td>'.price($objp->total_ht).'</td>'; print '<td>'.price($objp->total_ht).'</td>';
print '<td>'.$objp->name.'</td>'; print '<td>'.$objp->name.'</td>';
print '</td>'; print '</td>';
} print '</tr>';
}
$i++; $i++;
} }
print '</table>'; print '</table>';
print '</br>'; print '<br><center><input type="submit" class="button" value="'.$langs->trans('ToLink').'"></center>';
print '<br><center><input type="submit" class="button" value="'.$langs->trans('OK').'"></center>';
print '</form>'; print '</form>';
$db->free($resqlorderlist);
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
} }
$result=$object->add_object_linked('commande',$_POST['linkedOrder']);
if($result>0) print '</div>';
{
echo '<meta http-equiv="refresh" content="0;URL=facture.php?facid='.$object->id.'">';
} }
}
print '</div>';
}
// Link for paypal payment // Link for paypal payment
if (! empty($conf->paypal->enabled) && $object->statut != 0) if (! empty($conf->paypal->enabled) && $object->statut != 0)
{ {
@ -3946,20 +3955,4 @@ dol_htmloutput_mesg('',$mesgs);
llxFooter(); llxFooter();
$db->close(); $db->close();
?> ?>
<script>
function lier_commande(commande)
{
if(commande.style.display=='none')
{
commande.style.display='inline';
}
else
{
commande.style.display="none";
}
}
</script>

4
htdocs/societe/societe.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2013 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2013 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
@ -22,7 +22,7 @@
/** /**
* \file htdocs/societe/societe.php * \file htdocs/societe/societe.php
* \ingroup societe * \ingroup societe
* \brief Page to show a third party * \brief Page to show list of third parties
*/ */
require_once '../main.inc.php'; require_once '../main.inc.php';