From ddc0d4f3c3e19cec368f46c8ddfbbaa28e9cd84b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 20 Feb 2011 19:41:27 +0000
Subject: [PATCH] Restore old properties for compatibility
---
htdocs/lib/pdf.lib.php | 8 ++++----
htdocs/master.inc.php | 8 +++++++-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php
index ac6b3364909..5cf1687eb59 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/lib/pdf.lib.php
@@ -130,17 +130,17 @@ function pdf_format_address($outputlangs,$object)
// Zip/Town/State
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))
{
$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
{
- $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->cp);
- $ret .= ' '.$outputlangs->convToOutputCharset($object->ville);
+ $ret .= ($ret ? "\n" : '' ).$outputlangs->convToOutputCharset($object->zip);
+ $ret .= ' '.$outputlangs->convToOutputCharset($object->town);
if ($object->departement && in_array($object->pays_code,$countriesusingstate))
{
$ret.=", ".$outputlangs->convToOutputCharset($object->departement);
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 5e6794d01ce..a0924d4b28c 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -211,10 +211,15 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
$mysoc=new Societe($db);
$mysoc->id=0;
+ $mysoc->nom=$conf->global->MAIN_INFO_SOCIETE_NOM; // TODO deprecated
$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->cp=$conf->global->MAIN_INFO_SOCIETE_CP; // TODO deprecated
$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->departement_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT; // TODO deprecated
$mysoc->state_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT;
$mysoc->note=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
@@ -241,7 +246,8 @@ 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;
$mysoc->pays=$mysoc->country; // TODO deprecated
- $mysoc->phone=empty($conf->global->MAIN_INFO_SOCIETE_TEL)?'':$conf->global->MAIN_INFO_SOCIETE_TEL;
+ $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->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;
// Anciens id prof
--
GitLab