Skip to content
Snippets Groups Projects
Commit ddc0d4f3 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Restore old properties for compatibility

parent 0560de9f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/lib/pdf.lib.php
+ 4
− 4
View file @ ddc0d4f3
...@@ -130,17 +130,17 @@ function pdf_format_address($outputlangs,$object) ...@@ -130,17 +130,17 @@ function pdf_format_address($outputlangs,$object)
// Zip/Town/State // Zip/Town/State
if (in_array($object->pays_code,array('US'))) // US: town, state, zip if (in_array($object->pays_code,array('US'))) // US: town, state, zip
{ {
$ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->ville); $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->town);
if ($object->departement && in_array($object->pays_code,$countriesusingstate)) if ($object->departement && in_array($object->pays_code,$countriesusingstate))
{ {
$ret.=", ".$outputlangs->convToOutputCharset($object->departement); $ret.=", ".$outputlangs->convToOutputCharset($object->departement);
} }
if ($object->cp) $ret .= ', '.$outputlangs->convToOutputCharset($object->cp); if ($object->cp) $ret .= ', '.$outputlangs->convToOutputCharset($object->zip);
} }
else // Other: zip town, state else // Other: zip town, state
{ {
$ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->cp); $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->zip);
$ret .= ' '.$outputlangs->convToOutputCharset($object->ville); $ret .= ' '.$outputlangs->convToOutputCharset($object->town);
if ($object->departement && in_array($object->pays_code,$countriesusingstate)) if ($object->departement && in_array($object->pays_code,$countriesusingstate))
{ {
$ret.=", ".$outputlangs->convToOutputCharset($object->departement); $ret.=", ".$outputlangs->convToOutputCharset($object->departement);
......
htdocs/master.inc.php
+ 7
− 1
View file @ ddc0d4f3
...@@ -211,10 +211,15 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) ...@@ -211,10 +211,15 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
$mysoc=new Societe($db); $mysoc=new Societe($db);
$mysoc->id=0; $mysoc->id=0;
$mysoc->nom=$conf->global->MAIN_INFO_SOCIETE_NOM; // TODO deprecated
$mysoc->name=$conf->global->MAIN_INFO_SOCIETE_NOM; $mysoc->name=$conf->global->MAIN_INFO_SOCIETE_NOM;
$mysoc->adresse=$conf->global->MAIN_INFO_SOCIETE_ADRESSE; // TODO deprecated
$mysoc->address=$conf->global->MAIN_INFO_SOCIETE_ADRESSE; $mysoc->address=$conf->global->MAIN_INFO_SOCIETE_ADRESSE;
$mysoc->cp=$conf->global->MAIN_INFO_SOCIETE_CP; // TODO deprecated
$mysoc->zip=$conf->global->MAIN_INFO_SOCIETE_CP; $mysoc->zip=$conf->global->MAIN_INFO_SOCIETE_CP;
$mysoc->ville=$conf->global->MAIN_INFO_SOCIETE_VILLE; // TODO deprecated
$mysoc->town=$conf->global->MAIN_INFO_SOCIETE_VILLE; $mysoc->town=$conf->global->MAIN_INFO_SOCIETE_VILLE;
$mysoc->departement_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT; // TODO deprecated
$mysoc->state_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT; $mysoc->state_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT;
$mysoc->note=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE; $mysoc->note=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
...@@ -241,6 +246,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) ...@@ -241,6 +246,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
if (is_object($langs)) $mysoc->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label; if (is_object($langs)) $mysoc->country=($langs->trans('Country'.$country_code)!='Country'.$country_code)?$langs->trans('Country'.$country_code):$country_label;
$mysoc->pays=$mysoc->country; // TODO deprecated $mysoc->pays=$mysoc->country; // TODO deprecated
$mysoc->tel=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL; // TODO deprecated
$mysoc->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL; $mysoc->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
$mysoc->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX; $mysoc->fax=empty($conf->global->MAIN_INFO_SOCIETE_FAX)?'':$conf->global->MAIN_INFO_SOCIETE_FAX;
$mysoc->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB; $mysoc->url=empty($conf->global->MAIN_INFO_SOCIETE_WEB)?'':$conf->global->MAIN_INFO_SOCIETE_WEB;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment