Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-19 11:24:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS(cherry picked from

Browse Source 
commit 77870d0557)

Conflicts:

	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/stats/cabyuser.php
	htdocs/compta/stats/casoc.php
	htdocs/compta/stats/index.php
	htdocs/compta/stats/prev.php
	htdocs/compta/tva/clients.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/compta.lang
	htdocs/langs/fr_FR/compta.lang
This commit is contained in:
Laurent Destailleur
2012-01-15 02:00:44 +01:00
parent 16b1dcd49c
commit 032db89caa
13 changed files with 215 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/html.form.class.php
View File

@@ -2447,10 +2447,16 @@ class Form
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
print '<tr><td nowrap="nowrap">';
//if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': '; // If we want deposit to be substracted to payments only and not to total of final invoice
if (! $filter || $filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description='(DEPOSIT)')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
// print $langs->trans("AvailableGlobalDiscounts").': ';
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
{
if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->currency)).': '; // If we want deposit to be substracted to payments only and not to total of final invoice
else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
}
else
{
if (! $filter || $filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description='(DEPOSIT)')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->currency)).': ';
else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
}
$newfilter='fk_facture IS NULL AND fk_facture_line IS NULL'; // Remises disponibles
if ($filter) $newfilter.=' AND ('.$filter.')';
$nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue);