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

Update consumption.php

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-03-05 08:44:29 +01:00 committed by GitHub
parent dfb791837c
commit d13ed6bdfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/societe/consumption.php
View File

@ -4,6 +4,7 @@
* Copyright (C) 2013-2015 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015-2017 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2015-2017 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2021 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -472,6 +473,7 @@ if ($sql_select) {
$documentstatic->statut = $objp->status; $documentstatic->statut = $objp->status;
$documentstatic->status = $objp->status; $documentstatic->status = $objp->status;
$documentstatic->paye = $objp->paid; $documentstatic->paye = $objp->paid;
$documentstatic->alreadypaid = $objp->paid;
if (is_object($documentstaticline)) { if (is_object($documentstaticline)) {
$documentstaticline->statut = $objp->status; $documentstaticline->statut = $objp->status;
@ -487,6 +489,8 @@ if ($sql_select) {
print '<td class="center">'; print '<td class="center">';
if ($type_element == 'contract') { if ($type_element == 'contract') {
print $documentstaticline->getLibStatut(5); print $documentstaticline->getLibStatut(5);
} elseif ($type_element == 'invoice') {
print $documentstatic->getLibStatut(5, $objp->paid);
} else { } else {
print $documentstatic->getLibStatut(5); print $documentstatic->getLibStatut(5);
} }
@ -496,7 +500,9 @@ if ($sql_select) {
print '<td class="tdoverflowmax300">'; print '<td class="tdoverflowmax300">';
// Define text, description and type // Define text, description and type
$text = ''; $description = ''; $type = 0; $text = '';
$description = '';
$type = 0;
// Code to show product duplicated from commonobject->printObjectLine // Code to show product duplicated from commonobject->printObjectLine
if ($objp->fk_product > 0) { if ($objp->fk_product > 0) {