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

[CORE] ajouts des conditions spécifiques pour les appels depuis l'objet AskPriceSupplier (#new_ask_price).

Browse Source
This commit is contained in:
phf 2015-01-28 14:34:27 +01:00
parent 778ddf269d
commit ec621244f3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/commonobject.class.php
View File

@ -1768,7 +1768,7 @@ abstract class CommonObject
// Specific code for backward compatibility with old field names // Specific code for backward compatibility with old field names
if ($this->element == 'facture' || $this->element == 'facturerec') $fieldht='total'; if ($this->element == 'facture' || $this->element == 'facturerec') $fieldht='total';
if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva'; if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
if ($this->element == 'propal') $fieldttc='total'; if ($this->element == 'propal' || $this->element == 'askpricesupplier') $fieldttc='total';
if (empty($nodatabaseupdate)) if (empty($nodatabaseupdate))
{ {
@ -1958,6 +1958,9 @@ abstract class CommonObject
else if ($objecttype == 'propal') { else if ($objecttype == 'propal') {
$classpath = 'comm/propal/class'; $classpath = 'comm/propal/class';
} }
else if ($objecttype == 'askpricesupplier') {
$classpath = 'comm/askpricesupplier/class';
}
else if ($objecttype == 'shipping') { else if ($objecttype == 'shipping') {
$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon'; $classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
} }
@ -2473,6 +2476,10 @@ abstract class CommonObject
$tplpath = 'comm/'.$element; $tplpath = 'comm/'.$element;
if (empty($conf->propal->enabled)) continue; // Do not show if module disabled if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
} }
else if ($objecttype == 'askpricesupplier') {
$tplpath = 'comm/'.$element;
if (empty($conf->askpricesupplier->enabled)) continue; // Do not show if module disabled
}
else if ($objecttype == 'shipping') { else if ($objecttype == 'shipping') {
$tplpath = 'expedition'; $tplpath = 'expedition';
if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled