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

Dbut dbugage et amlioration du module expdition

Browse Source
This commit is contained in:
Regis Houssin 2007-11-20 17:23:21 +00:00
parent 606dc28fbf
commit c91da9ee35
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -931,6 +931,8 @@ class pdf_propale_azur extends ModelePDFPropales
// Caractéristiques client
$carac_client.="\n".$object->client->adresse;
$carac_client.="\n".$object->client->cp . " " . $object->client->ville."\n";
//Pays si différent de l'émetteur
if ($this->emetteur->pays_code != $object->client->pays_code)
{
$carac_client.=$object->client->pays."\n";

50
htdocs/livraison/mods/pdf/pdf_typhon.modules.php
View File

@ -71,18 +71,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$this->franchise=1;
// Recupere code pays de l'emmetteur
$this->emetteur->code_pays=substr($langs->defaultlang,-2); // Par defaut, si on trouve pas
$sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE rowid = '".$conf->global->MAIN_INFO_SOCIETE_PAYS."'";
$result=$this->db->query($sql);
if ($result) {
$obj = $this->db->fetch_object($result);
if ($obj->code) $this->emetteur->code_pays=$obj->code;
}
else {
dolibarr_print_error($this->db);
}
$this->db->free($result);
if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2); // Par defaut, si n'était pas défini
$this->tva=array();
@ -757,27 +746,34 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/*
* if a delivery address is used, use that, else use the client address
*/
$client = new Societe($this->db);
if ($commande->adresse_livraison_id>0) {
$client = new Societe($this->db);
if ($commande->adresse_livraison_id > 0) {
$client->fetch_adresse_livraison($commande->adresse_livraison_id);
} else {
$client->fetch($delivery->socid);
}
$delivery->client = $client;
//
$delivery->client = $client;
// Cadre client destinataire
$pdf->rect(100, $posy, 100, $hautcadre);
// Nom client
// Nom client
$pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',11);
$pdf->MultiCell(106,4, $delivery->client->nom, 0, 'L');
// Caractéristiques client
$carac_client=$delivery->client->adresse."\n";
$carac_client.=$delivery->client->cp . " " . $delivery->client->ville."\n";
// Caractéristiques client
$carac_client=$delivery->client->adresse;
$carac_client.="\n".$delivery->client->cp . " " . $delivery->client->ville."\n";
if ($delivery->client->tva_intra) $carac_client.="\n".$langs->transnoentities("VATIntraShort").': '.$delivery->client->tva_intra;
// Pays si différent de l'émetteur
if ($this->emetteur->pays_code != $delivery->client->pays_code)
{
$carac_client.=$delivery->client->pays."\n";
}
// Tva intracom
if ($delivery->client->tva_intra) $carac_client.="\n".$langs->transnoentities("VATIntraShort").': '.$delivery->client->tva_intra;
$pdf->SetFont('Arial','',9);
$pdf->SetXY(102,$posy+8);
$pdf->MultiCell(86,4, $carac_client);
@ -810,22 +806,22 @@ class pdf_typhon extends ModelePDFDeliveryOrder
}
if ($conf->global->MAIN_INFO_SIRET)
{
$ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId2",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIRET;
$ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId2",$this->emetteur->pays_code).": ".$conf->global->MAIN_INFO_SIRET;
}
if ($conf->global->MAIN_INFO_SIREN && (! $conf->global->MAIN_INFO_SIRET || $this->emetteur->code_pays != 'FR'))
if ($conf->global->MAIN_INFO_SIREN && (! $conf->global->MAIN_INFO_SIRET || $this->emetteur->pays_code != 'FR'))
{
$ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId1",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIREN;
$ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId1",$this->emetteur->pays_code).": ".$conf->global->MAIN_INFO_SIREN;
}
if ($conf->global->MAIN_INFO_APE)
{
$ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId3",$this->emetteur->code_pays).": ".MAIN_INFO_APE;
$ligne1.=($ligne1?" - ":"").$langs->transcountry("ProfId3",$this->emetteur->pays_code).": ".MAIN_INFO_APE;
}
// Deuxieme ligne d'info réglementaires
$ligne2="";
if ($conf->global->MAIN_INFO_RCS)
{
$ligne2.=($ligne2?" - ":"").$langs->transcountry("ProfId4",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_RCS;
$ligne2.=($ligne2?" - ":"").$langs->transcountry("ProfId4",$this->emetteur->pays_code).": ".$conf->global->MAIN_INFO_RCS;
}
if ($conf->global->MAIN_INFO_TVAINTRA != '')
{

11
htdocs/societe.class.php
View File

@ -635,12 +635,12 @@ class Societe
*/
function fetch_adresse_livraison($id)
{
global $conf;
global $conf,$langs;
$sql = "SELECT l.rowid, l.label, l.fk_societe, l.nom, l.address, l.cp";
$sql .= ", ".$this->db->pdate("l.tms")."as dm, ".$this->db->pdate("l.datec")."as dc";
$sql .= ", l.ville, l.fk_pays, l.note";
$sql .= ", p.libelle as pays, p.code, s.nom as socname";
$sql .= ", p.libelle as pays, p.code as pays_code, s.nom as socname";
$sql .= " FROM ".MAIN_DB_PREFIX."societe_adresse_livraison as l";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON l.fk_pays = p.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON l.fk_societe = s.rowid";
@ -660,10 +660,13 @@ class Societe
$this->societe = $obj->socname;
$this->nom = $obj->nom;
$this->address = $obj->address;
$this->adresse = $obj->address; //Todo: uniformiser le nom des champs
$this->cp = $obj->cp;
$this->ville = $obj->ville;
$this->pays = $obj->pays;
$this->code_pays = $obj->code;
$this->pays_id = $obj->fk_pays;
$this->pays_code = $obj->fk_pays?$obj->pays_code:'';
$this->pays = $obj->fk_pays?($langs->trans('Country'.$obj->pays_code)!='Country'.$obj->pays_code?strtoupper(clean_html($langs->trans('Country'.$obj->pays_code))):$obj->pays):'';
$this->db->free($result);