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

New: Add balance of each account statement.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-02-07 23:32:46 +01:00
parent 3bdf8864a9
commit ef31ca9b84
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/compta/bank/releve.php
View File

@ -146,9 +146,14 @@ if (empty($num))
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("AccountStatement").'</td></tr>'; print '<td>'.$langs->trans("AccountStatement").'</td>';
print '<td>'.$langs->trans("InitialBankBalance").'</td>';
print '<td>'.$langs->trans("EndBankBalance").'</td>';
print '</tr>';
$balancestart=array();
$content=array();
//while ($i < min($numrows,$conf->liste_limit)) // retrait de la limite tant qu'il n'y a pas de pagination
while ($i < min($numrows,$conf->liste_limit)) while ($i < min($numrows,$conf->liste_limit))
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
@ -159,7 +164,37 @@ if (empty($num))
} }
else else
{ {
print '<tr '.$bc[$var].'><td><a href="releve.php?num='.$objp->numr.'&amp;account='.$acct->id.'">'.$objp->numr.'</a></td></tr>'."\n"; print '<tr '.$bc[$var].'><td><a href="releve.php?num='.$objp->numr.'&amp;account='.$acct->id.'">'.$objp->numr.'</a></td>';
// Calculate start amount
$sql = "SELECT sum(b.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql.= " WHERE b.num_releve < '".$db->escape($objp->numr)."'";
$sql.= " AND b.fk_account = ".$acct->id;
$resql=$db->query($sql);
if ($resql)
{
$obj=$db->fetch_object($resql);
$balancestart[$objp->numr] = $obj->amount;
$db->free($resql);
}
print '<td>'.price($balancestart[$objp->numr],'',$langs,1,-1,-1,$conf->currency).'</td>';
// Calculate end amount
$sql = "SELECT sum(b.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql.= " WHERE b.num_releve = '".$db->escape($objp->numr)."'";
$sql.= " AND b.fk_account = ".$acct->id;
$resql=$db->query($sql);
if ($resql)
{
$obj=$db->fetch_object($resql);
$content[$objp->numr] = $obj->amount;
$db->free($resql);
}
print '<td>'.price(($balancestart[$objp->numr]+$content[$objp->numr]),'',$langs,1,-1,-1,$conf->currency).'</td>';
print '</tr>'."\n";
} }
$i++; $i++;
} }
@ -179,6 +214,7 @@ else
*/ */
$ve=$_GET["ve"]; $ve=$_GET["ve"];
// Define number of receipt to show (current, previous or next one ?)
$found=false; $found=false;
if ($_GET["rel"] == 'prev') if ($_GET["rel"] == 'prev')
{ {

3
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
View File

@ -19,6 +19,9 @@
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
ALTER TABLE llx_bank ADD INDEX idx_bank_num_releve(num_releve);
--create table for price expressions and add column in product supplier --create table for price expressions and add column in product supplier
create table llx_c_price_expression create table llx_c_price_expression
( (

2
htdocs/install/mysql/tables/llx_bank.key.sql
View File

@ -20,5 +20,7 @@ ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev);
ALTER TABLE llx_bank ADD INDEX idx_bank_dateo(dateo); ALTER TABLE llx_bank ADD INDEX idx_bank_dateo(dateo);
ALTER TABLE llx_bank ADD INDEX idx_bank_fk_account(fk_account); ALTER TABLE llx_bank ADD INDEX idx_bank_fk_account(fk_account);
ALTER TABLE llx_bank ADD INDEX idx_bank_rappro(rappro); ALTER TABLE llx_bank ADD INDEX idx_bank_rappro(rappro);
ALTER TABLE llx_bank ADD INDEX idx_bank_num_releve(num_releve);