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

New: Ajout d'un champ type dans la table llx_bank_url pour indiquer la nature du lien. Permettra d'en faire une utilisation plus pousse.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-15 00:59:01 +00:00
parent 211c091042
commit 87afad2a34
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/compta/bank/account.class.php
View File

@ -86,23 +86,28 @@ class Account
$result = $this->db->query($sql); $result = $this->db->query($sql);
} }
/* /**
* * \brief Ajoute lien entre ecriture bancaire et sources
* \param line_id Id ecriture bancaire
* \param url_id Id parametre url
* \param url Url
* \param type Type de lien (payment, company, member, ...)
* \return int <0 si ko, id line si ok
*/ */
function add_url_line($line_id, $url_id, $url, $label) function add_url_line($line_id, $url_id, $url, $label, $type='')
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (fk_bank, url_id, url, label)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (fk_bank, url_id, url, label, type)";
$sql .= " VALUES ('$line_id', '$url_id', '$url', '$label')"; $sql .= " VALUES ('$line_id', '$url_id', '$url', '$label', '$type')";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url"); $rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
return $rowid; return $rowid;
} }
else else
{ {
return ''; $this->error=$this->db->error();
return -1;
} }
} }

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

@ -412,7 +412,7 @@ function _print_lines($db,$result,$sql,$acct)
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print '<td align="center">'; print '<td align="center">';
print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page=$page">'; print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';
print img_edit(); print img_edit();
print '</a> &nbsp;'; print '</a> &nbsp;';
print '<a href="account.php?action=del&amp;rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">'; print '<a href="account.php?action=del&amp;rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';

6
htdocs/compta/paiement.php
View File

@ -130,11 +130,13 @@ if ($_POST["action"] == 'add_paiement')
$acc->add_url_line($bank_line_id, $acc->add_url_line($bank_line_id,
$paiement_id, $paiement_id,
DOL_URL_ROOT.'/compta/paiement/fiche.php?id=', DOL_URL_ROOT.'/compta/paiement/fiche.php?id=',
"(paiement)"); "(paiement)",
'payment');
$acc->add_url_line($bank_line_id, $acc->add_url_line($bank_line_id,
$fac->client->id, $fac->client->id,
DOL_URL_ROOT.'/compta/fiche.php?socid=', DOL_URL_ROOT.'/compta/fiche.php?socid=',
$fac->client->nom); $fac->client->nom,
'company');
} }
} }

3
mysql/migration/1.1.0-2.0.0.sql
View File

@ -705,7 +705,8 @@ update llx_bank set datev=dateo where datev is null;
update llx_chargesociales set periode=date_ech where periode is null or periode = '0000-00-00'; update llx_chargesociales set periode=date_ech where periode is null or periode = '0000-00-00';
-- pour virer les doublons de llx_bank_url (dus à un ancien bug) -- pour virer les doublons de llx_bank_url (dus à un ancien bug)
ALTER IGNORE TABLE llx_bank_url ADD UNIQUE INDEX(fk_bank,url_id); alter ignore table llx_bank_url add unique index(fk_bank,url_id);
alter table llx_bank_url add type varchar(16);
create table llx_societe_remise create table llx_societe_remise
( (

3
mysql/tables/llx_bank_url.sql
View File

@ -26,5 +26,6 @@ create table llx_bank_url
fk_bank integer, fk_bank integer,
url_id integer, url_id integer,
url varchar(255), url varchar(255),
label varchar(255) label varchar(255),
type varchar(16)
)type=innodb; )type=innodb;