diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ff01690660a..555e89e7a61 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -162,6 +162,8 @@ $arrayfields=array(
'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
'p.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),
'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
+ 'p.total_ht_invoiced'=>array('label'=>$langs->trans("AmountInvoicedHT"), 'checked'=>0, 'enabled'=>$conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT),
+ 'p.total_invoiced'=>array('label'=>$langs->trans("AmountInvoicedTTC"), 'checked'=>0, 'enabled'=>$conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT),
'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>1),
'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
@@ -644,6 +646,18 @@ if ($resql)
print '';
print '';
}
+ if (! empty($arrayfields['p.total_ht_invoiced']['checked']))
+ {
+ // Amount invoiced
+ print '
';
+ print ' | ';
+ }
+ if (! empty($arrayfields['p.total_invoiced']['checked']))
+ {
+ // Amount invoiced
+ print '';
+ print ' | ';
+ }
if (! empty($arrayfields['u.login']['checked']))
{
// Author
@@ -709,6 +723,8 @@ if ($resql)
if (! empty($arrayfields['p.total_ht']['checked'])) print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['p.total_vat']['checked'])) print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['p.total_ttc']['checked'])) print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['p.total_ht_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['p.total_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
// Extra fields
@@ -933,6 +949,48 @@ if ($resql)
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
}
+ // Amount invoiced
+ if(! empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+ $totalInvoiced = 0;
+ $p = new Propal($db);
+ $TInvoiceData = $p->InvoiceArrayList($obj->rowid);
+
+ if(! empty($TInvoiceData)) {
+ foreach($TInvoiceData as $invoiceData) {
+ $invoice = new Facture($db);
+ $invoice->fetch($invoiceData->facid);
+
+ if(! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) continue;
+ $totalInvoiced += $invoice->total_ht;
+ }
+ }
+
+ print ''.price($totalInvoiced)." | \n";
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalhtinvoicedfield']=$totalarray['nbfield'];
+ $totalarray['totalhtinvoiced'] += $totalInvoiced;
+ }
+ // Amount invoiced
+ if(! empty($arrayfields['p.total_invoiced']['checked'])) {
+ $totalInvoiced = 0;
+ $p = new Propal($db);
+ $TInvoiceData = $p->InvoiceArrayList($obj->rowid);
+
+ if(! empty($TInvoiceData)) {
+ foreach($TInvoiceData as $invoiceData) {
+ $invoice = new Facture($db);
+ $invoice->fetch($invoiceData->facid);
+
+ if(! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) continue;
+ $totalInvoiced += $invoice->total_ttc;
+ }
+ }
+
+ print ''.price($totalInvoiced)." | \n";
+ if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalinvoicedfield']=$totalarray['nbfield'];
+ $totalarray['totalinvoiced'] += $totalInvoiced;
+ }
$userstatic->id=$obj->fk_user_author;
$userstatic->login=$obj->login;
@@ -1059,6 +1117,8 @@ if ($resql)
elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' | ';
elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' | ';
elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' | ';
+ elseif ($totalarray['totalhtinvoicedfield'] == $i) print ''.price($totalarray['totalhtinvoiced']).' | ';
+ elseif ($totalarray['totalinvoicedfield'] == $i) print ''.price($totalarray['totalinvoiced']).' | ';
elseif ($totalarray['totalizable']) {
$printed = false;
foreach ($totalarray['totalizable'] as $totalizable) {
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index dabe27f0368..909044188de 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -347,6 +347,8 @@ PriceUTTC=P.U TTC
Amount=Montant
AmountInvoice=Montant facture
AmountInvoiced=Montant facturé
+AmountInvoicedHT=Montant HT facturé
+AmountInvoicedTTC=Montant TTC facturé
AmountPayment=Montant paiement
AmountHTShort=Montant HT
AmountTTCShort=Montant TTC