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

Merge pull request #23823 from grandoc/new_branch_07_02_2023

Browse Source 
fix : Warning: Undefined property: ExpenseReport:: in /home/httpd/vho…
This commit is contained in:
Laurent Destailleur 2023-02-09 15:16:19 +01:00 committed by GitHub
commit bbca94ba03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr> * Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2016-2022 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2016-2023 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018 Francis Appels <francis.appels@z-application.com> * Copyright (C) 2018 Francis Appels <francis.appels@z-application.com>
* Copyright (C) 2019 Markus Welters <markus@welters.de> * Copyright (C) 2019 Markus Welters <markus@welters.de>
@ -92,6 +92,8 @@ class pdf_standard extends ModeleExpenseReport
public $posxtva; public $posxtva;
public $posxup; public $posxup;
public $posxqty; public $posxqty;
public $posxtype;
public $posxprojet;
public $postotalht; public $postotalht;
public $postotalttc; public $postotalttc;

30
htdocs/expensereport/class/expensereport.class.php
View File

@ -133,6 +133,21 @@ class ExpenseReport extends CommonObject
public $statuts_short = array(); public $statuts_short = array();
public $statuts_logo; public $statuts_logo;
// Multicurrency
/**
* @var int Currency ID
*/
public $fk_multicurrency;
/**
* @var string multicurrency code
*/
public $multicurrency_code;
public $multicurrency_tx;
public $multicurrency_total_ht;
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
/** /**
* Draft status * Draft status
@ -2739,6 +2754,21 @@ class ExpenseReportLine extends CommonObjectLine
public $total_localtax1; public $total_localtax1;
public $total_localtax2; public $total_localtax2;
// Multicurrency
/**
* @var int Currency ID
*/
public $fk_multicurrency;
/**
* @var string multicurrency code
*/
public $multicurrency_code;
public $multicurrency_tx;
public $multicurrency_total_ht;
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
/** /**
* @var int ID into llx_ecm_files table to link line to attached file * @var int ID into llx_ecm_files table to link line to attached file
*/ */