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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-05-27 23:38:46 +02:00
commit f66555b396
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/bank/class/account.class.php
View File

@ -1774,11 +1774,13 @@ class AccountLine extends CommonObject
*/ */
public $fk_account; public $fk_account;
public $bank_account_label; // Label of bank account /**
* @var string Label of bank account
*/
public $bank_account_label;
/** /**
* Issuer * @var string Name of check issuer
* @var Societe
*/ */
public $emetteur; public $emetteur;

10
htdocs/core/class/html.formaccounting.class.php
View File

@ -432,11 +432,11 @@ class FormAccounting extends Form
/** /**
* Return HTML combo list of years existing into book keepping * Return HTML combo list of years existing into book keepping
* *
* @param string $selected Preselected value * @param string $selected Preselected value
* @param string $htmlname Name of HTML select object * @param string $htmlname Name of HTML select object
* @param int $useempty Affiche valeur vide dans liste * @param int $useempty Affiche valeur vide dans liste
* @param string $output_format (html/opton (for option html only)/array (to return options arrays * @param string $output_format (html/opton (for option html only)/array (to return options arrays
* @return string/array * @return string|array HTML select component or array of select options
*/ */
public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html') public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
{ {

2
htdocs/debugbar/class/TraceableDB.php
View File

@ -26,7 +26,7 @@ class TraceableDB extends DoliDB
*/ */
protected $startMemory; protected $startMemory;
/** /**
* @var Database type * @var string type
*/ */
public $type; public $type;
/** /**

6
htdocs/opensurvey/class/opensurveysondage.class.php
View File

@ -83,14 +83,12 @@ class Opensurveysondage extends CommonObject
public $sujet; public $sujet;
/** /**
* Allow comments on this poll * @var int Allow comments on this poll
* @var bool
*/ */
public $allow_comments; public $allow_comments;
/** /**
* Allow users see others vote * @var int Allow users see others vote
* @var bool
*/ */
public $allow_spy; public $allow_spy;

6
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -80,9 +80,14 @@ class MouvementStock extends CommonObject
public $fk_origin; public $fk_origin;
public $origintype; public $origintype;
public $inventorycode; public $inventorycode;
public $batch; public $batch;
/**
* @var Object Object set as origin before calling livraison() or reception()
*/
public $origin;
public $fields = array( public $fields = array(
'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1), 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
@ -385,6 +390,7 @@ class MouvementStock extends CommonObject
if ($movestock && $entrepot_id > 0) // Change stock for current product, change for subproduct is done after if ($movestock && $entrepot_id > 0) // Change stock for current product, change for subproduct is done after
{ {
// Set $origintype, fk_origin, fk_project
$fk_project = 0; $fk_project = 0;
if (!empty($this->origin)) { // This is set by caller for tracking reason if (!empty($this->origin)) { // This is set by caller for tracking reason
$origintype = empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type; $origintype = empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type;

2
htdocs/ticket/class/ticket.class.php
View File

@ -2440,7 +2440,7 @@ class Ticket extends CommonObject
$id = $object->createTicketMessage($user, 0, $listofpaths, $listofmimes, $listofnames); $id = $object->createTicketMessage($user, 0, $listofpaths, $listofmimes, $listofnames);
if ($id <= 0) { if ($id <= 0) {
$error++; $error++;
$this->errors = $object->error; $this->error = $object->error;
$this->errors = $object->errors; $this->errors = $object->errors;
$action = 'add_message'; $action = 'add_message';
} }

2
htdocs/user/class/usergroup.class.php
View File

@ -606,7 +606,7 @@ class UserGroup extends CommonObject
* Delete a group * Delete a group
* *
* @param User $user User that delete * @param User $user User that delete
* @return <0 if KO, > 0 if OK * @return int <0 if KO, > 0 if OK
*/ */
public function delete(User $user) public function delete(User $user)
{ {