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

[CORE] correction mineurs pour travis (#new_ask_price).

Browse Source
This commit is contained in:
phf 2015-02-09 10:17:28 +01:00
parent 34bc1dbc15
commit a1d2f426b8
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
View File

@ -300,6 +300,7 @@ class AskPriceSupplier extends CommonObject
* @param int $pa_ht Buying price without tax * @param int $pa_ht Buying price without tax
* @param string $label ??? * @param string $label ???
* @param array $array_option extrafields array * @param array $array_option extrafields array
* @param string $ref_fourn Supplier price reference
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
* *
* @see add_product * @see add_product
@ -476,9 +477,10 @@ class AskPriceSupplier extends CommonObject
* @param string $label ??? * @param string $label ???
* @param int $type 0/1=Product/service * @param int $type 0/1=Product/service
* @param array $array_option extrafields array * @param array $array_option extrafields array
* @param string $ref_fourn Supplier price reference
* @return int 0 if OK, <0 if KO * @return int 0 if OK, <0 if KO
*/ */
function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $array_option=0, $ref_fourn) function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $array_option=0, $ref_fourn='')
{ {
global $conf,$user,$langs, $mysoc; global $conf,$user,$langs, $mysoc;

6
htdocs/core/modules/askpricesupplier/mod_askpricesupplier_saphir.php
View File

@ -102,9 +102,9 @@ class mod_askpricesupplier_saphir extends ModeleNumRefAskPriceSupplier
/** /**
* Return next value * Return next value
* *
* @param Societe $objsoc Object third party * @param Societe $objsoc Object third party
* @param Propal $propal Object commercial proposal * @param Propal $askpricesupplier Object askpricesupplier
* @return string Value if OK, 0 if KO * @return string Value if OK, 0 if KO
*/ */
function getNextValue($objsoc,$askpricesupplier) function getNextValue($objsoc,$askpricesupplier)
{ {

2
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1693,7 +1693,7 @@ class CommandeFournisseur extends CommonOrder
if ($user->rights->fournisseur->commande->creer) if ($user->rights->fournisseur->commande->creer)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur"; $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
$sql.= " SET fk_projet = ".($id_projet > 0 ? (int)$id_projet : 'null'); $sql.= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::set_id_projet", LOG_DEBUG); dol_syslog(get_class($this)."::set_id_projet", LOG_DEBUG);