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

Fix: obsolete

Browse Source
This commit is contained in:
Regis Houssin 2009-12-23 08:43:16 +00:00
parent 10ae9fe93b
commit 2df0d15ef7
6 changed files with 29 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/admin/facture.php
View File

@ -177,11 +177,6 @@ if ($_POST["action"] == 'set_enable_editdelete')
dolibarr_set_const($db, "FACTURE_ENABLE_EDITDELETE",$_POST["enable_editdelete"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "FACTURE_ENABLE_EDITDELETE",$_POST["enable_editdelete"],'chaine',0,'',$conf->entity);
} }
if ($_POST["action"] == 'set_use_bill_contact_as_recipient')
{
dolibarr_set_const($db, "FACTURE_USE_BILL_CONTACT_AS_RECIPIENT",$_POST["use_bill_contact_as_recipient"],'chaine',0,'',$conf->entity);
}
if ($_POST["action"] == 'update' || $_POST["action"] == 'add') if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
{ {
if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity)); if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity));
@ -257,7 +252,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
if (is_readable($dir.$filebis)) if (is_readable($dir.$filebis))
{ {
// Chargement de la classe de num<EFBFBD>rotation // Chargement de la classe de numerotation
require_once($dir.$filebis); require_once($dir.$filebis);
$classname = "mod_facture_".$file; $classname = "mod_facture_".$file;
$module = new $classname($db); $module = new $classname($db);
@ -613,21 +608,6 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
print "</td></tr>\n"; print "</td></tr>\n";
print '</form>'; print '</form>';
/*
$var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="set_use_bill_contact_as_recipient">';
print '<tr '.$bc[$var].'><td>';
print $langs->trans("UsBillingContactAsIncoiveRecipientIfExist");
print '</td><td width="60" align="center">';
print $html->selectyesno("use_bill_contact_as_recipient",$conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td></tr>\n";
print '</form>';
*/
$var=! $var; $var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

3
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@ -514,9 +514,6 @@ Class pdf_expedition_merou extends ModelePdfExpedition
if ($usecontact) if ($usecontact)
{ {
// On peut utiliser le nom de la societe du contact
//if ($conf->global->FACTURE_USE_COMPANY_NAME_OF_BILL_CONTACT) $socname = $object->contact->socname;
//else
$socname = $object->client->nom; $socname = $object->client->nom;
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);

16
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -1097,15 +1097,13 @@ class pdf_crabe extends ModelePDFFactures
// If BILLING contact defined on invoice, we use it // If BILLING contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->getIdContact('external','BILLING');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->getIdContact('external','BILLING'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// On peut utiliser le nom de la societe du contact // On peut utiliser le nom de la societe du contact

16
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -884,15 +884,13 @@ class pdf_oursin extends ModelePDFFactures
// If BILLING contact defined on invoice, we use it // If BILLING contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->getIdContact('external','BILLING');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->getIdContact('external','BILLING'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// On peut utiliser le nom de la societe du contact facturation // On peut utiliser le nom de la societe du contact facturation

19
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -404,20 +404,15 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
// If SHIPPING contact defined on invoice, we use it // If SHIPPING contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->commande->getIdContact('external','SHIPPING');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->commande->getIdContact('external','SHIPPING'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// On peut utiliser le nom de la societe du contact
//if ($conf->global->FACTURE_USE_COMPANY_NAME_OF_BILL_CONTACT) $socname = $object->contact->socname;
//else
$socname = $object->client->nom; $socname = $object->client->nom;
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);

19
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -574,20 +574,15 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// If SHIPPING contact defined on invoice, we use it // If SHIPPING contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->commande->getIdContact('external','SHIPPING');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->commande->getIdContact('external','SHIPPING'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// On peut utiliser le nom de la societe du contact
//if ($conf->global->FACTURE_USE_COMPANY_NAME_OF_BILL_CONTACT) $socname = $object->contact->socname;
//else
$socname = $object->client->nom; $socname = $object->client->nom;
$carac_client_name=$outputlangs->convToOutputCharset($socname); $carac_client_name=$outputlangs->convToOutputCharset($socname);