Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2012-06-28 22:58:44 +02:00
commit efbd0a2533
2 changed files with 3 additions and 2 deletions

View File

@ -78,7 +78,8 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
function get_code($db, $societe, $type='') function get_code($db, $societe, $type='')
{ {
// Renvoie toujours ok // Renvoie toujours ok
$this->code = $societe->code_compta; if ($type == 'supplier') $this->code = $societe->code_compta_fournisseur;
else $this->code = $societe->code_compta;
return 0; return 0;
} }
} }

View File

@ -126,7 +126,7 @@ if (empty($reshook))
$action=""; $action="";
} }
if ($action == 'setaccountancy_code_buy') if ($action == 'setaccountancy_code_sell')
{ {
$object->fetch($id,$ref); $object->fetch($id,$ref);
$result = $object->setValueFrom('accountancy_code_sell', $_POST['accountancy_code_sell']); $result = $object->setValueFrom('accountancy_code_sell', $_POST['accountancy_code_sell']);