Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur
2023-05-01 17:21:00 +02:00
parent 4f7f2b4e5a
commit 2d17e77ff7
24 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1591,6 +1591,7 @@ class CommandeFournisseur extends CommonOrder
$result = $this->call_trigger('ORDER_SUPPLIER_CREATE', $user);
if ($result < 0) {
$this->db->rollback();
return -1;
}
// End call triggers
@@ -1601,12 +1602,18 @@ class CommandeFournisseur extends CommonOrder
} else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -2;
}
} else {
$this->error = 'Failed to get ID of inserted line';
return -1;
}
} else {
$this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
}
}

48
htdocs/fourn/class/fournisseur.facture-rec.class.php
View File

@@ -847,29 +847,29 @@ class FactureFournisseurRec extends CommonInvoice
}
/**
* Add a line to recursive supplier invoice
* Add a line to recursive supplier invoice
*
* @param int $fk_product Product/Service ID predefined
* @param string $ref Ref
* @param string $label Label
* @param string $desc Description de la ligne
* @param double $pu_ht Unit price
* @param double $pu_ttc Unit price with tax
* @param double $qty Quantity
* @param int $remise_percent Percentage discount of the line
* @param double $txtva Taux de tva force, sinon -1
* @param int $txlocaltax1 Local tax 1 rate (deprecated)
* @param int $txlocaltax2 Local tax 2 rate (deprecated)
* @param string $price_base_type HT or TTC
* @param int $type Type of line (0=product, 1=service)
* @param int $date_start Date start
* @param int $date_end Date end
* @param int $info_bits VAT npr or not ?
* @param int $special_code Special code
* @param int $rang Position of line
* @param string $fk_unit Unit
* @param int $pu_ht_devise Unit price in currency
* @return int <0 if KO, Id of line if OK
* @param int $fk_product Product/Service ID predefined
* @param string $ref Ref
* @param string $label Label
* @param string $desc Description de la ligne
* @param double $pu_ht Unit price
* @param double $pu_ttc Unit price with tax
* @param double $qty Quantity
* @param int $remise_percent Percentage discount of the line
* @param double $txtva Taux de tva force, sinon -1
* @param int $txlocaltax1 Local tax 1 rate (deprecated)
* @param int $txlocaltax2 Local tax 2 rate (deprecated)
* @param string $price_base_type HT or TTC
* @param int $type Type of line (0=product, 1=service)
* @param int $date_start Date start
* @param int $date_end Date end
* @param int $info_bits VAT npr or not ?
* @param int $special_code Special code
* @param int $rang Position of line
* @param string $fk_unit Unit
* @param int $pu_ht_devise Unit price in currency
* @return int <0 if KO, Id of line if OK
* @throws Exception
*/
public function addline($fk_product, $ref, $label, $desc, $pu_ht, $pu_ttc, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $type = 0, $date_start = 0, $date_end = 0, $info_bits = 0, $special_code = 0, $rang = -1, $fk_unit = null, $pu_ht_devise = 0)
@@ -1031,6 +1031,10 @@ class FactureFournisseurRec extends CommonInvoice
return -1;
}
} else {
$this->error = 'Recurring Invoice is suspended. adding lines not allowed.';
return -1;
}
}