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

Merge pull request #2255 from frederic34/patch-1

Browse Source 
Correct travis error
This commit is contained in:
Laurent Destailleur 2015-01-18 12:33:51 +01:00
commit 83675daa8a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/compta/facture/class/facture.class.php
View File

@ -2335,8 +2335,11 @@ class Facture extends CommonInvoice
} }
/** /**
* Update invoice line with percentage
*
* @param FactureLigne $line Invoice line * @param FactureLigne $line Invoice line
* @param int $percent * @param int $percent Percentage
* @return void
*/ */
function update_percent($line, $percent) function update_percent($line, $percent)
{ {
@ -3451,6 +3454,7 @@ class Facture extends CommonInvoice
/** /**
* Checks if the invoice is the first of a cycle * Checks if the invoice is the first of a cycle
* *
* @return boolean
*/ */
function is_first() function is_first()
{ {
@ -3460,6 +3464,7 @@ class Facture extends CommonInvoice
/** /**
* Returns an array containing the previous situations as Facture objects * Returns an array containing the previous situations as Facture objects
* *
* @return mixed -1 if error, array of previous situations
*/ */
function get_prev_sits() function get_prev_sits()
{ {
@ -3514,7 +3519,6 @@ class Facture extends CommonInvoice
* @return int 0 or 1 if OK, -1 if error * @return int 0 or 1 if OK, -1 if error
* *
*/ */
function is_last_in_cycle() function is_last_in_cycle()
{ {
$sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_cycle_ref = ' . $this->situation_cycle_ref; $sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_cycle_ref = ' . $this->situation_cycle_ref;
@ -4096,7 +4100,6 @@ class FactureLigne extends CommonInvoiceLine
* *
* @return int >= 0 * @return int >= 0
*/ */
function get_prev_progress() function get_prev_progress()
{ {
if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") { if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {

2
htdocs/core/class/html.form.class.php
View File

@ -2666,7 +2666,7 @@ class Form
* *
* @return string HTML select * @return string HTML select
*/ */
function load_situation_invoices($selected = '', $socid) function load_situation_invoices($selected = '', $socid = '')
{ {
global $langs; global $langs;