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

Type bank & tva

Browse Source
This commit is contained in:
aspangaro 2014-04-28 06:41:27 +02:00
parent 73eec6b872
commit bab54f8264
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/bank/account.php
View File

@ -465,10 +465,11 @@ if ($id > 0 || ! empty($ref))
if ($mode_search && ! empty($conf->tax->enabled)) if ($mode_search && ! empty($conf->tax->enabled))
{ {
// VAT // VAT
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='payment_vat'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='payment_vat'";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."tva as t ON bu2.url_id = t.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."tva as t ON bu2.url_id = t.rowid";
// Salary payment
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment_salary'"; // Salary payment
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment_salary'";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_salary as sal ON bu3.url_id = sal.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_salary as sal ON bu3.url_id = sal.rowid";
} }
if ($mode_search && ! empty($conf->adherent->enabled)) if ($mode_search && ! empty($conf->adherent->enabled))
@ -587,7 +588,7 @@ if ($id > 0 || ! empty($ref))
$paymentvatstatic->ref=$links[$key]['url_id']; $paymentvatstatic->ref=$links[$key]['url_id'];
print ' '.$paymentvatstatic->getNomUrl(2); print ' '.$paymentvatstatic->getNomUrl(2);
} }
elseif ($links[$key]['type']=='payment_salary') elseif ($links[$key]['type']=='payment_salary')
{ {
$paymentsalstatic->id=$links[$key]['url_id']; $paymentsalstatic->id=$links[$key]['url_id'];
$paymentsalstatic->ref=$links[$key]['url_id']; $paymentsalstatic->ref=$links[$key]['url_id'];
@ -628,7 +629,7 @@ if ($id > 0 || ! empty($ref))
{ {
} }
elseif ($links[$key]['type']=='user') elseif ($links[$key]['type']=='user')
{ {
} }
@ -670,7 +671,7 @@ if ($id > 0 || ! empty($ref))
$societestatic->nom=$links[$key]['label']; $societestatic->nom=$links[$key]['label'];
print $societestatic->getNomUrl(1,'',16); print $societestatic->getNomUrl(1,'',16);
} }
else if ($links[$key]['type']=='user') else if ($links[$key]['type']=='user')
{ {
$userstatic->id=$links[$key]['url_id']; $userstatic->id=$links[$key]['url_id'];
$userstatic->lastname=$links[$key]['label']; $userstatic->lastname=$links[$key]['label'];

2
htdocs/compta/bank/search.php
View File

@ -252,7 +252,7 @@ if ($resql)
print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->dv),"day")."</td>\n"; print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->dv),"day")."</td>\n";
// Payment type // Payment type
print "<td align=\"center\">"; print '<td class="nowrap">';
$labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle'); $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle');
if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance"); if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
else print $labeltype; else print $labeltype;

4
htdocs/compta/tva/class/tva.class.php
View File

@ -323,7 +323,7 @@ class Tva extends CommonObject
/** /**
* Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de TVA, non ? * Hum la fonction s'appelle 'Solde' elle doit a mon avis calculer le solde de TVA, non ?
* *
* @param int $year Year * @param int $year Year
* @return double Amount * @return double Amount
@ -589,7 +589,7 @@ class Tva extends CommonObject
} }
/** /**
* Mise a jour du lien entre le paiement tva et la ligne g<EFBFBD>n<EFBFBD>r<EFBFBD>e dans llx_bank * Mise a jour du lien entre le paiement tva et la ligne generee dans llx_bank
* *
* @param int $id_bank Id compte bancaire * @param int $id_bank Id compte bancaire
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK