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

Work on withdrawal module

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-05 01:20:53 +00:00
parent 5d7807a101
commit 0578acf414
4 changed files with 225 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
htdocs/admin/prelevement.php
View File

@ -44,7 +44,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');*/
if ($_GET["action"] == "set") if ($_GET["action"] == "set")
{ {
for ($i = 1 ; $i < 7 ; $i++) for ($i = 6 ; $i < 7 ; $i++)
{ {
dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity);
} }
@ -91,31 +91,6 @@ print '<td width="30%">'.$langs->trans("Parameter").'</td>';
print '<td width="40%">'.$langs->trans("Value").'</td>'; print '<td width="40%">'.$langs->trans("Value").'</td>';
print '<td width="30%">'.$langs->trans("CurrentValue").'</td>'; print '<td width="30%">'.$langs->trans("CurrentValue").'</td>';
print "</tr>\n"; print "</tr>\n";
print '<tr class="pair"><td>'.$langs->trans("NumeroNationalEmetter").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom1" value="PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR">';
print '<input type="text" name="value1" value="'.$conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR.'" size="9" ></td>';
print '<td>'.$conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR.'</td></tr>';
print '<tr class="impair"><td>'.$langs->trans("Name").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom2" value="PRELEVEMENT_RAISON_SOCIALE">';
print '<input type="text" name="value2" value="'.$conf->global->PRELEVEMENT_RAISON_SOCIALE.'" size="14" ></td>';
print '<td>'.$conf->global->PRELEVEMENT_RAISON_SOCIALE.'</td></tr>';
print '<tr class="pair"><td>'.$langs->trans("BankCode").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom3" value="PRELEVEMENT_CODE_BANQUE">';
print '<input type="text" name="value3" value="'.$conf->global->PRELEVEMENT_CODE_BANQUE.'" size="6" ></td>';
print '<td>'.$conf->global->PRELEVEMENT_CODE_BANQUE.'</td></tr>';
print '<tr class="impair"><td>'.$langs->trans("DeskCode").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom4" value="PRELEVEMENT_CODE_GUICHET">';
print '<input type="text" name="value4" value="'.$conf->global->PRELEVEMENT_CODE_GUICHET.'" size="6" ></td>';
print '<td>'.$conf->global->PRELEVEMENT_CODE_GUICHET.'</td></tr>';
print '<tr class="pair"><td>'.$langs->trans("AccountNumber").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom5" value="PRELEVEMENT_NUMERO_COMPTE">';
print '<input type="text" name="value5" value="'.$conf->global->PRELEVEMENT_NUMERO_COMPTE.'" size="11" ></td>';
print '<td>'.$conf->global->PRELEVEMENT_NUMERO_COMPTE.'</td></tr>';
print '<tr class="impair"><td>'.$langs->trans("ResponsibleUser").'</td>'; print '<tr class="impair"><td>'.$langs->trans("ResponsibleUser").'</td>';
print '<td align="left">'; print '<td align="left">';
print '<input type="hidden" name="nom6" value="PRELEVEMENT_USER">'; print '<input type="hidden" name="nom6" value="PRELEVEMENT_USER">';
@ -138,9 +113,9 @@ print '</table>';
print '</form>'; print '</form>';
print '<br>'; print '<br>';
/* /*
* Notifications * Notifications
* TODO Use notification module instead
*/ */
if ($conf->global->MAIN_MODULE_NOTIFICATION) if ($conf->global->MAIN_MODULE_NOTIFICATION)
@ -157,47 +132,38 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
print '<td align="right">'.$langs->trans("Action").'</td>'; print '<td align="right">'.$langs->trans("Action").'</td>';
print "</tr>\n"; print "</tr>\n";
print '<tr class="impair"><td align="left">'; print '<tr class="impair"><td align="left">';
print '<input type="hidden" name="nom6" value="PRELEVEMENT_USER">'; print $html->select_users(0,'user',1);
print '<select name="user">'; print '</td>';
print '<td>';
$sql = "SELECT u.rowid, u.name, u.firstname"; print '<select name="action">';
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql = "SELECT ad.rowid, ad.code, ad.titre";
$sql.= " WHERE u.entity IN (0,".$conf->entity.")"; $sql.= " FROM action_def as ad";
$sql.= " ORDER BY u.name ASC"; $sql.= " WHERE ad.objet_type = 'withdraw'";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$var = false;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print '<option value="'.$obj->rowid.'">'.$obj->firstname." ".$obj->name; print '<option value="'.$obj->code.'">'.$obj->titre.'</option>';
$i++;
} }
$db->free();
} }
print '</select></td>';
print '<td>';
print '<select name="action">';
print '<option value="tr">'.$langs->trans("NotifyTransmision").'</option>';
print '<option value="em">'.$langs->trans("NotifyEmision").'</option>';
print '<option value="cr">'.$langs->trans("NotifyCredit").'</option>';
print '</select></td>'; print '</select></td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>'; print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
} }
// List of current notifications for objet_type='withdraw'
$sql = "SELECT u.name, u.firstname"; $sql = "SELECT u.name, u.firstname";
$sql.= ", pn.action, pn.rowid"; $sql.= ", ad.rowid, ad.code, ad.titre";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_notifications as pn"; $sql.= ", ".MAIN_DB_PREFIX."notify_def as nd";
$sql.= " WHERE u.rowid = pn.fk_user"; $sql.= ", ".MAIN_DB_PREFIX."action_def as ad";
$sql.= " WHERE u.rowid = nd.fk_user AND nd.fk_action = ad.rowid";
$sql.= " ad.objet_type = 'withdraw'";
$sql.= " AND u.entity IN (0,".$conf->entity.")"; $sql.= " AND u.entity IN (0,".$conf->entity.")";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
@ -210,11 +176,11 @@ if ($resql)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td>'.$obj->firstname." ".$obj->name.'</td>'; print '<td>'.$obj->firstname." ".$obj->name.'</td>';
print '<td>'.$obj->action.'</td>'; print '<td>'.$obj->titre.'</td>';
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
{ {
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&amp;notif='.$obj->rowid.'">'.img_delete().'</a></td></tr>'; print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&amp;notif='.$obj->code.'">'.img_delete().'</a></td></tr>';
} }
else else
{ {

11
htdocs/compta/prelevement/class/bon-prelevement.class.php
View File

@ -975,13 +975,10 @@ class BonPrelevement extends CommonObject
if (!$error) if (!$error)
{ {
/* /*
* Bon de Prelevement * Withdraw receipt
*
*
*/ */
dol_syslog("Debut prelevement"); dol_syslog("Debut prelevement - Nombre de factures ".sizeof($factures_prev));
dol_syslog("Nombre de factures ".sizeof($factures_prev));
if (sizeof($factures_prev) > 0) if (sizeof($factures_prev) > 0)
{ {
@ -1233,7 +1230,7 @@ class BonPrelevement extends CommonObject
/** /**
* Write recipient of withdraw * Write recipient of withdraw (me)
* @param rowid Id of line * @param rowid Id of line
* @param client_nom Name of customer * @param client_nom Name of customer
* @param rib_banque * @param rib_banque
@ -1302,7 +1299,7 @@ class BonPrelevement extends CommonObject
/** /**
* Write sender (me) * Write sender (customer)
*/ */
function EnregEmetteur() function EnregEmetteur()
{ {

199
htdocs/compta/prelevement/create.php
View File

@ -90,21 +90,69 @@ print '<tr><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
print '<td align="right">'; print '<td align="right">';
print $nb; print $nb;
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("NbOfInvoiceToWithdraw").' '.$langs->trans("ThirdPartyBankCode").'='.$conf->global->PRELEVEMENT_CODE_BANQUE.'</td><td align="right">';
print $nb1;
print '</td></tr>';
print '<tr><td>'.$langs->trans("NbOfInvoiceToWithdraw").' '.$langs->trans("ThirdPartyDeskCode").'='.$conf->global->PRELEVEMENT_CODE_GUICHET.'</td><td align="right">';
print $nb11;
print '</td></tr>';
print '<tr><td>'.$langs->trans("AmountToWithdraw").'</td>'; print '</table>';
print '<td align="right">';
print price($bprev->SommeAPrelever()); print '<br>';
print_fiche_titre($langs->trans("PleaseSelectCustomerBankBANToWithdraw"),'','');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<table class="border" width="100%">';
print '<tr class="pair"><td>'.$langs->trans("NumeroNationalEmetter").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom1" value="PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR">';
print '<input type="text" name="value1" value="'.$conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR.'" size="9" ></td>';
print '</tr>';
print '<tr class="impair"><td>'.$langs->trans("Name").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom2" value="PRELEVEMENT_RAISON_SOCIALE">';
print '<input type="text" name="value2" value="'.$conf->global->PRELEVEMENT_RAISON_SOCIALE.'" size="14" ></td>';
print '</tr>';
print '<tr class="pair"><td>'.$langs->trans("BankCode").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom3" value="PRELEVEMENT_CODE_BANQUE">';
print '<input type="text" name="value3" value="'.$conf->global->PRELEVEMENT_CODE_BANQUE.'" size="6" ></td>';
print '</tr>';
print '<tr class="impair"><td>'.$langs->trans("DeskCode").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom4" value="PRELEVEMENT_CODE_GUICHET">';
print '<input type="text" name="value4" value="'.$conf->global->PRELEVEMENT_CODE_GUICHET.'" size="6" ></td>';
print '</tr>';
print '<tr class="pair"><td>'.$langs->trans("AccountNumber").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom5" value="PRELEVEMENT_NUMERO_COMPTE">';
print '<input type="text" name="value5" value="'.$conf->global->PRELEVEMENT_NUMERO_COMPTE.'" size="11" ></td>';
print '</tr>';
print '<tr class="pair"><td colspan="2" align="center">';
print '<input type="submit" class="button" name="modify" value="'.dol_escape_htmltag($langs->trans("Modify")).'">';
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '</table>'; print '</table>';
print '</form>';
print '<br>';
print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("NbOfInvoiceToWithdraw").' + '.$langs->trans("ThirdPartyBankCode").'='.$conf->global->PRELEVEMENT_CODE_BANQUE.'</td><td align="right">';
print $nb1;
print '</td></tr>';
print '<tr><td>'.$langs->trans("NbOfInvoiceToWithdraw").' + '.$langs->trans("ThirdPartyBankCode").'='.$conf->global->PRELEVEMENT_CODE_BANQUE.' + '.$langs->trans("ThirdPartyDeskCode").'='.$conf->global->PRELEVEMENT_CODE_GUICHET.'</td><td align="right">';
print $nb11;
print '</td></tr>';
$pricetowithdraw=$bprev->SommeAPrelever();
print '<tr><td>'.$langs->trans("AmountToWithdraw").'</td>';
print '<td align="right">';
print price($pricetowithdraw);
print '</td>';
print '</tr>';
print '</table>';
print '</div>'; print '</div>';
if ($mesg) print $mesg; if ($mesg) print $mesg;
@ -113,7 +161,11 @@ if ($nb)
{ {
print "<div class=\"tabsAction\">\n"; print "<div class=\"tabsAction\">\n";
if ($nb) print '<a class="butAction" href="create.php?action=create">'.$langs->trans("CreateAll")."</a>\n"; if ($nb)
{
if ($pricetowithdraw) print '<a class="butAction" href="create.php?action=create">'.$langs->trans("CreateAll")."</a>\n";
else print '<a class="butActionRefused" href="#">'.$langs->trans("CreateAll")."</a>\n";
}
if ($nb11) print '<a class="butAction" href="create.php?action=create&amp;banque=1">'.$langs->trans("CreateBanque")."</a>\n"; if ($nb11) print '<a class="butAction" href="create.php?action=create&amp;banque=1">'.$langs->trans("CreateBanque")."</a>\n";
if ($nb1) print '<a class="butAction" href="create.php?action=create&amp;banque=1&amp;guichet=1">'.$langs->trans("CreateGuichet")."</a>\n"; if ($nb1) print '<a class="butAction" href="create.php?action=create&amp;banque=1&amp;guichet=1">'.$langs->trans("CreateGuichet")."</a>\n";
@ -126,12 +178,76 @@ else
print '<br>'; print '<br>';
/* /*
* Liste des derniers bons * Invoices waiting for withdraw
* */
$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.rowid as socid";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql.= " WHERE s.rowid = f.fk_soc";
$sql.= " AND f.entity = ".$conf->entity;
$sql.= " AND pfd.traite = 0";
$sql.= " AND pfd.fk_facture = f.rowid";
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
$resql=$db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
print_fiche_titre($langs->trans("InvoiceWaitingWithdraw").' ('.$num.')','','');
if ($num)
{
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Invoice").'</td>';
print '<td>'.$langs->trans("ThirdParty").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
print '</tr>';
$var = True;
while ($i < $num && $i < 20)
{
$obj = $db->fetch_object($resql);
$var=!$var;
print '<tr '.$bc[$var].'><td>';
$invoicestatic->id=$obj->rowid;
$invoicestatic->ref=$obj->facnumber;
print $invoicestatic->getNomUrl(1,'withdraw');
print '</td>';
print '<td>';
$thirdpartystatic->id=$obj->socid;
$thirdpartystatic->nom=$obj->nom;
print $thirdpartystatic->getNomUrl(1,'customer');
print '</td>';
print '<td align="right">';
print price($obj->total_ttc).' '.$langs->trans("Currency".$conf->monnaie)."</td>\n";
print '</td>';
print '</tr>';
$i++;
}
print "</table><br>";
}
}
else
{
dol_print_error($db);
}
/*
* List of last withdraws
*/ */
$limit=5; $limit=5;
print_fiche_titre($langs->trans("LastWithdrawalReceipts",$limit),'','');
$sql = "SELECT p.rowid, p.ref, p.amount, p.statut"; $sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
$sql.= ", p.datec"; $sql.= ", p.datec";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
@ -147,8 +263,8 @@ if ($result)
print"\n<!-- debut table -->\n"; print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("LastWithdrawalReceipts",$limit).'</td>'; print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td>';
print '<td><Date</td><td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="center">'.$langs->trans("Date").'</td><td align="right">'.$langs->trans("Amount").'</td>';
print '</tr>'; print '</tr>';
$var=True; $var=True;
@ -179,60 +295,7 @@ else
} }
$db->close();
/*
* Factures en attente de prelevement
*
*/
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.rowid as socid";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql.= " WHERE s.rowid = f.fk_soc";
$sql.= " AND f.entity = ".$conf->entity;
$sql.= " AND pfd.traite = 0";
$sql.= " AND pfd.fk_facture = f.rowid";
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
$resql=$db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
if ($num)
{
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</td></tr>';
$var = True;
while ($i < $num && $i < 20)
{
$obj = $db->fetch_object($resql);
$var=!$var;
print '<tr '.$bc[$var].'><td>';
$invoicestatic->id=$obj->rowid;
$invoicestatic->ref=$obj->facnumber;
print $invoicestatic->getNomUrl(1,'withdraw');
print '</td>';
print '<td>';
$thirdpartystatic->id=$obj->socid;
$thirdpartystatic->nom=$obj->nom;
print $thirdpartystatic->getNomUrl(1,'customer');
print '</td>';
print '</tr>';
$i++;
}
print "</table><br>";
}
}
else
{
dol_print_error($db);
}
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
?> ?>

12
htdocs/compta/prelevement/stats.php
View File

@ -45,13 +45,12 @@ llxHeader('',$langs->trans("WithdrawStatistics"));
print_fiche_titre($langs->trans("WithdrawStatistics")); print_fiche_titre($langs->trans("WithdrawStatistics"));
// Define total and nbtotal
$sql = "SELECT sum(pl.amount), count(pl.amount)"; $sql = "SELECT sum(pl.amount), count(pl.amount)";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE pl.fk_soc = s.rowid"; $sql.= " WHERE pl.fk_soc = s.rowid";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -66,9 +65,9 @@ if ($resql)
} }
} }
/* /*
* Stats * Stats
*
*/ */
$sql = "SELECT sum(pl.amount), count(pl.amount), pl.statut"; $sql = "SELECT sum(pl.amount), count(pl.amount), pl.statut";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@ -142,13 +141,13 @@ else
print '<br>'; print '<br>';
print_titre($langs->trans("WithdrawRejectStatistics")); print_titre($langs->trans("WithdrawRejectStatistics"));
// Define total and nbtotal
$sql = "SELECT sum(pl.amount), count(pl.amount)"; $sql = "SELECT sum(pl.amount), count(pl.amount)";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= ", ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE pl.fk_soc = s.rowid"; $sql.= " WHERE pl.fk_soc = s.rowid";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
$sql.= " WHERE pl.statut = 3"; $sql.= " AND pl.statut = 3";
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -165,7 +164,6 @@ if ($resql)
/* /*
* Stats sur les rejets * Stats sur les rejets
*
*/ */
$sql = "SELECT sum(pl.amount), count(pl.amount) as cc, pr.motif"; $sql = "SELECT sum(pl.amount), count(pl.amount) as cc, pr.motif";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@ -225,7 +223,7 @@ if ($resql)
print price($total); print price($total);
print '</td><td align="right">&nbsp;</td>'; print '</td><td align="right">&nbsp;</td>';
print "</tr></table>"; print "</tr></table>";
$db->free(); $db->free($resql);
} }
else else
{ {