Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
058b87fe29
4 changed files with 9 additions and 7 deletions
|
|
@ -1293,6 +1293,7 @@ class Facture extends CommonInvoice
|
|||
$object->date = (empty($this->date) ? dol_now() : $this->date);
|
||||
$object->user_creation_id = $user->id;
|
||||
$object->user_validation_id = null;
|
||||
$object->user_modification_id = null;
|
||||
$object->fk_user_author = $user->id;
|
||||
$object->fk_user_valid = null;
|
||||
$object->fk_facture_source = 0;
|
||||
|
|
@ -1625,6 +1626,7 @@ class Facture extends CommonInvoice
|
|||
$this->origin_id = $object->id;
|
||||
|
||||
$this->fk_user_author = $user->id;
|
||||
$this->user_creation_id = $user->id;
|
||||
|
||||
// get extrafields from original line
|
||||
$object->fetch_optionals();
|
||||
|
|
@ -5563,7 +5565,7 @@ class Facture extends CommonInvoice
|
|||
$this->note_public = 'This is a comment (public)';
|
||||
$this->note_private = 'This is a comment (private)';
|
||||
|
||||
$this->fk_user_author = $user->id;
|
||||
$this->user_creation_id = $user->id;
|
||||
|
||||
$this->multicurrency_tx = 1;
|
||||
$this->multicurrency_code = $conf->currency;
|
||||
|
|
|
|||
|
|
@ -732,7 +732,7 @@ abstract class CommonObject
|
|||
public $user_validation_id;
|
||||
|
||||
/**
|
||||
* @var int User id closing object
|
||||
* @var int|null User id closing object
|
||||
*/
|
||||
public $user_closing_id;
|
||||
|
||||
|
|
@ -743,7 +743,7 @@ abstract class CommonObject
|
|||
public $user_modification;
|
||||
|
||||
/**
|
||||
* @var int User ID who last modified the object
|
||||
* @var int|null User ID who last modified the object
|
||||
*/
|
||||
public $user_modification_id;
|
||||
|
||||
|
|
|
|||
|
|
@ -618,7 +618,7 @@ class pdf_octopus extends ModelePDFFactures
|
|||
}
|
||||
}
|
||||
|
||||
// Displays notes. Here we are still on code eecuted only for the first page.
|
||||
// Displays notes. Here we are still on code executed only for the first page.
|
||||
$notetoshow = empty($object->note_public) ? '' : $object->note_public;
|
||||
if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
|
||||
// Get first sale rep
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2023 Alexandre Janniaux <alexandre.janniaux@gmail.com>
|
||||
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
|
|
@ -171,8 +171,8 @@ class FactureTest extends CommonClassTest
|
|||
true,
|
||||
// Not comparing:
|
||||
array(
|
||||
'newref','oldref','id','lines','client','thirdparty','brouillon','user_creation_id','date_creation','date_validation','datem','date_modification',
|
||||
'ref','statut','status','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
|
||||
'newref','oldref','id','lines','client','thirdparty','brouillon', 'fk_user_author', 'user_modification_id', 'date_creation','date_validation','datem','date_modification',
|
||||
'ref','statut','status','paye','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
|
||||
'cond_reglement_doc', 'modelpdf',
|
||||
'multicurrency_total_ht','multicurrency_total_tva', 'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
|
||||
'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
|
||||
|
|
|
|||
Loading…
Reference in a new issue