Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Update information on linked thirdparty

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-29 22:55:04 +00:00
parent d70f1e5e0b
commit ea4ce5b340
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/lib/functions.lib.php
View File

@@ -3194,6 +3194,7 @@ function get_default_npr($societe_vendeuse, $societe_acheteuse, $idprod)
/** /**
* Function that return localtax of a product line (according to seller, buyer and product vat rate) * Function that return localtax of a product line (according to seller, buyer and product vat rate)
*
* @param societe_vendeuse Objet societe vendeuse * @param societe_vendeuse Objet societe vendeuse
* @param societe_acheteuse Objet societe acheteuse * @param societe_acheteuse Objet societe acheteuse
* @param local Localtax to process (1 or 2) * @param local Localtax to process (1 or 2)
@@ -3205,7 +3206,7 @@ function get_default_localtax($societe_vendeuse, $societe_acheteuse, $local, $id
if (!is_object($societe_vendeuse)) return -1; if (!is_object($societe_vendeuse)) return -1;
if (!is_object($societe_acheteuse)) return -1; if (!is_object($societe_acheteuse)) return -1;
if($societe_vendeuse->pays_id=='ES') if ($societe_vendeuse->pays_id=='ES' || $societe_vendeuse->pays_code=='ES')
{ {
if ($local==1) //RE if ($local==1) //RE
{ {

2
htdocs/societe/class/societe.class.php
View File

@@ -477,7 +477,7 @@ class Societe extends CommonObject
$sql.= ",ville = ".($this->town?"'".$this->db->escape($this->town)."'":"null"); $sql.= ",ville = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
$sql .= ",fk_departement = '" . ($this->state_id?$this->state_id:'0') ."'"; $sql .= ",fk_departement = '" . ($this->state_id?$this->state_id:'0') ."'";
$sql .= ",fk_pays = '" . ($this->pays_id?$this->pays_id:'0') ."'"; $sql .= ",fk_pays = '" . ($this->country_id?$this->country_id:'0') ."'";
$sql .= ",tel = ".($this->tel?"'".$this->db->escape($this->tel)."'":"null"); $sql .= ",tel = ".($this->tel?"'".$this->db->escape($this->tel)."'":"null");
$sql .= ",fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null"); $sql .= ",fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null");