122 |
$acct->fetch($_GET["account"]); |
$acct->fetch($_GET["account"]); |
123 |
|
|
124 |
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, ".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type as type"; |
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, ".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type as type"; |
125 |
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE rappro=0 AND fk_account=".$_GET["account"]; |
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; |
126 |
$sql .= " ORDER BY dateo"; |
$sql.= " WHERE rappro=0 AND fk_account=".$_GET["account"]; |
127 |
$sql .= " ASC LIMIT ".$conf->liste_limit; |
$sql.= " ORDER BY dateo"; |
128 |
|
$sql.= " ASC LIMIT ".$conf->liste_limit; |
129 |
|
|
130 |
$resql = $db->query($sql); |
$resql = $db->query($sql); |
131 |
if ($resql) |
if ($resql) |
132 |
{ |
{ |
133 |
$var=True; |
$var=True; |
134 |
$num = $db->num_rows($resql); |
$num = $db->num_rows($resql); |
135 |
|
|
136 |
print_titre('Rapprochement compte bancaire : <a href="account.php?account='.$_GET["account"].'">'.$acct->label.'</a>'); |
print_titre($langs->trans("Reconciliation").': <a href="account.php?account='.$_GET["account"].'">'.$acct->label.'</a>'); |
137 |
print '<br>'; |
print '<br>'; |
138 |
|
|
139 |
if ($msg) { |
if ($msg) { |
140 |
print "$msg<br><br>"; |
print "$msg<br><br>"; |
141 |
} |
} |
142 |
|
|
143 |
// Affiche nom des derniers relevés |
// Affiche nom des derniers relevés |
144 |
$nbmax=5; |
$nbmax=5; |
145 |
$liste=""; |
$liste=""; |
146 |
|
|
147 |
$sql = "SELECT distinct num_releve FROM ".MAIN_DB_PREFIX."bank"; |
$sql = "SELECT distinct num_releve FROM ".MAIN_DB_PREFIX."bank"; |
148 |
$sql.= " WHERE fk_account=".$_GET["account"]; |
$sql.= " WHERE fk_account=".$_GET["account"]; |
149 |
$sql.= " ORDER BY num_releve DESC"; |
$sql.= " ORDER BY num_releve DESC"; |
150 |
$sql.= " LIMIT ".($nbmax+1); |
$sql.= " LIMIT ".($nbmax+1); |
151 |
print $langs->trans("LastAccountStatements").' : '; |
print $langs->trans("LastAccountStatements").' : '; |
152 |
$resqlr=$db->query($sql); |
$resqlr=$db->query($sql); |
153 |
if ($resqlr) |
if ($resqlr) |
154 |
{ |
{ |
155 |
$numr=$db->num_rows($resqlr); |
$numr=$db->num_rows($resqlr); |
156 |
$i=0; |
$i=0; |
157 |
while (($i < $numr) && ($i < $nbmax)) |
while (($i < $numr) && ($i < $nbmax)) |
158 |
{ |
{ |
159 |
$objr = $db->fetch_object($resqlr); |
$objr = $db->fetch_object($resqlr); |
160 |
$last_releve = $objr->num_releve; |
$last_releve = $objr->num_releve; |
161 |
$i++; |
$i++; |
162 |
$liste='<a href="releve.php?account='.$_GET["account"].'&num='.$objr->num_releve.'">'.$objr->num_releve.'</a> '.$liste; |
$liste='<a href="releve.php?account='.$_GET["account"].'&num='.$objr->num_releve.'">'.$objr->num_releve.'</a> '.$liste; |
|
} |
|
|
if ($num >= $nbmax) $liste="... ".$liste; |
|
|
print "$liste"; |
|
|
if ($num > 0) print '<br><br>'; |
|
|
else print $langs->trans("None").'<br><br>'; |
|
163 |
} |
} |
164 |
else |
if ($num >= $nbmax) $liste="... ".$liste; |
165 |
|
print "$liste"; |
166 |
|
if ($num > 0) print '<br><br>'; |
167 |
|
else print $langs->trans("None").'<br><br>'; |
168 |
|
} |
169 |
|
else |
170 |
{ |
{ |
171 |
dolibarr_print_error($db); |
dolibarr_print_error($db); |
172 |
} |
} |
173 |
|
|
174 |
print '<table class="noborder" width="100%">'; |
print '<table class="noborder" width="100%">'; |
175 |
print "<tr class=\"liste_titre\">\n"; |
print "<tr class=\"liste_titre\">\n"; |
176 |
print '<td>'.$langs->trans("Date").'</td>'; |
print '<td>'.$langs->trans("Date").'</td>'; |
177 |
print '<td>'.$langs->trans("DateValue").'</td>'; |
print '<td>'.$langs->trans("DateValue").'</td>'; |
178 |
print '<td>'.$langs->trans("Type").'</td>'; |
print '<td>'.$langs->trans("Type").'</td>'; |
179 |
print '<td>'.$langs->trans("Description").'</td>'; |
print '<td>'.$langs->trans("Description").'</td>'; |
180 |
print '<td align="right">'.$langs->trans("Debit").'</td>'; |
print '<td align="right">'.$langs->trans("Debit").'</td>'; |
181 |
print '<td align="right">'.$langs->trans("Credit").'</td>'; |
print '<td align="right">'.$langs->trans("Credit").'</td>'; |
182 |
print '<td align="center" width="60">'.$langs->trans("Action").'</td>'; |
print '<td align="center" width="60">'.$langs->trans("Action").'</td>'; |
183 |
print '<td align="center" width="100" colspan="2">'.$langs->trans("AccountStatement").' (Ex: YYYYMM)</td>'; |
print '<td align="center" width="100" colspan="2">'.$langs->trans("AccountStatement").' (Ex: YYYYMM)</td>'; |
184 |
print "</tr>\n"; |
print "</tr>\n"; |
185 |
|
|
186 |
|
|
187 |
$i = 0; |
$i = 0; |
188 |
while ($i < $num) |
while ($i < $num) |
189 |
{ |
{ |
190 |
$objp = $db->fetch_object($resql); |
$objp = $db->fetch_object($resql); |
191 |
|
|
192 |
$var=!$var; |
$var=!$var; |
193 |
print "<tr $bc[$var]>"; |
print "<tr $bc[$var]>"; |
194 |
print '<form method="post" action="rappro.php?account='.$_GET["account"].'">'; |
print '<form method="post" action="rappro.php?account='.$_GET["account"].'">'; |
195 |
print "<input type=\"hidden\" name=\"action\" value=\"rappro\">"; |
print "<input type=\"hidden\" name=\"action\" value=\"rappro\">"; |
196 |
print "<input type=\"hidden\" name=\"account\" value=\"".$_GET["account"]."\">"; |
print "<input type=\"hidden\" name=\"account\" value=\"".$_GET["account"]."\">"; |
197 |
print "<input type=\"hidden\" name=\"rowid\" value=\"".$objp->rowid."\">"; |
print "<input type=\"hidden\" name=\"rowid\" value=\"".$objp->rowid."\">"; |
198 |
|
|
199 |
print '<td nowrap>'.dolibarr_print_date($objp->do).'</td>'; |
print '<td nowrap>'.dolibarr_print_date($objp->do).'</td>'; |
200 |
print '<td nowrap>'.dolibarr_print_date($objp->dv).'</td>'; |
print '<td nowrap>'.dolibarr_print_date($objp->dv).'</td>'; |
201 |
print '<td nowrap>'.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').'</td>'; |
print '<td nowrap>'.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').'</td>'; |
202 |
print '<td>'.$objp->label.'</td>'; |
print '<td><a href="ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'">'.$objp->label.'</a>'; |
203 |
|
/* |
204 |
if ($objp->amount < 0) |
* Ajout les liens |
205 |
{ |
*/ |
206 |
print "<td align=\"right\" nowrap>".price($objp->amount * -1)."</td><td> </td>\n"; |
$links = $acct->get_url($objp->rowid); |
207 |
} |
foreach($links as $key=>$val) |
208 |
else |
{ |
209 |
{ |
print ' - '; |
210 |
print "<td> </td><td align=\"right\" nowrap>".price($objp->amount)."</td>\n"; |
print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">'; |
211 |
} |
// if ($links[$key]['type']=='payment') { print img_object($langs->trans('ShowPayment'),'payment').' '; } |
212 |
|
// if ($links[$key]['type']=='company') { print img_object($langs->trans('ShowCustomer'),'company').' '; } |
213 |
if ($objp->rappro) |
print $links[$key]['label'].'</a>'; |
214 |
|
} |
215 |
|
print '</td>'; |
216 |
|
|
217 |
|
if ($objp->amount < 0) |
218 |
{ |
{ |
219 |
// Si ligne déjà rapprochée, on affiche relevé. |
print "<td align=\"right\" nowrap>".price($objp->amount * -1)."</td><td> </td>\n"; |
|
print "<td align=\"center\"><a href=\"releve.php?num=$objp->num_releve&account=$acct->id\">$objp->num_releve</a></td>"; |
|
220 |
} |
} |
221 |
else |
else |
222 |
{ |
{ |
223 |
// Si pas encore rapproch |
print "<td> </td><td align=\"right\" nowrap>".price($objp->amount)."</td>\n"; |
224 |
|
} |
225 |
|
|
226 |
|
if ($objp->rappro) |
227 |
|
{ |
228 |
|
// Si ligne déjà rapprochée, on affiche relevé. |
229 |
|
print "<td align=\"center\"><a href=\"releve.php?num=$objp->num_releve&account=$acct->id\">$objp->num_releve</a></td>"; |
230 |
|
} |
231 |
|
else |
232 |
|
{ |
233 |
|
// Si pas encore rapprochée |
234 |
if ($user->rights->banque->modifier) |
if ($user->rights->banque->modifier) |
235 |
{ |
{ |
236 |
print '<td align="center" width="30">'; |
print '<td align="center" width="30">'; |
237 |
|
|
238 |
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&orig_account='.$acct->id.'">'; |
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&orig_account='.$acct->id.'">'; |
239 |
print img_edit(); |
print img_edit(); |
240 |
print '</a> '; |
print '</a> '; |
241 |
|
|
242 |
if ($objp->do <= mktime() ) { |
if ($objp->do <= mktime() ) { |
243 |
print '<a href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?action=del&rowid='.$objp->rowid.'&account='.$acct->id.'">'; |
print '<a href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?action=del&rowid='.$objp->rowid.'&account='.$acct->id.'">'; |
244 |
print img_delete(); |
print img_delete(); |
254 |
print "<td align=\"center\"> </td>"; |
print "<td align=\"center\"> </td>"; |
255 |
} |
} |
256 |
} |
} |
257 |
|
|
258 |
|
|
259 |
// Affiche bouton "Rapprocher" |
// Affiche bouton "Rapprocher" |
260 |
if ($objp->do <= mktime() ) { |
if ($objp->do <= mktime() ) { |
261 |
print "<td align=\"center\">"; |
print "<td align=\"center\">"; |
262 |
print "<input class=\"flat\" name=\"num_releve\" type=\"text\" value=\"\" size=\"8\">"; |
print "<input class=\"flat\" name=\"num_releve\" type=\"text\" value=\"\" size=\"8\">"; |
263 |
if ($options) |
if ($options) |
264 |
{ |
{ |
265 |
print "<br><select name=\"cat1\">$options"; |
print "<br><select name=\"cat1\">$options"; |
266 |
print "</select>"; |
print "</select>"; |
267 |
} |
} |
268 |
print "</td>"; |
print "</td>"; |
269 |
print "<td align=\"center\"><input class=\"button\" type=\"submit\" value=\"".$langs->trans("Rapprocher")."\">"; |
print "<td align=\"center\"><input class=\"button\" type=\"submit\" value=\"".$langs->trans("Rapprocher")."\">"; |
270 |
print "</td>"; |
print "</td>"; |
271 |
} |
} |
272 |
else |
else |
273 |
{ |
{ |
274 |
print "<td align=\"left\" colspan=\"2\">"; |
print "<td align=\"left\" colspan=\"2\">"; |
275 |
print "Ecriture future. Ne peut pas encore être rapprochée."; |
print "Ecriture future. Ne peut pas encore être rapprochée."; |
276 |
print "</td>"; |
print "</td>"; |
277 |
} |
} |
278 |
|
|
279 |
print "</tr>\n"; |
print "</tr>\n"; |
280 |
print "</form>\n"; |
print "</form>\n"; |
281 |
$i++; |
$i++; |
282 |
} |
} |
283 |
$db->free($resql); |
$db->free($resql); |
284 |
|
|
285 |
if ($num != 0) |
if ($num != 0) |
286 |
{ |
{ |
287 |
print "</table>\n"; |
print "</table><br>\n"; |
288 |
} |
} |
289 |
|
|
290 |
} |
} |
291 |
else |
else |
292 |
{ |
{ |