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

Fix: Le lien vers paiement sur les paiement fournisseurs amener sur un paiement client

Browse Source
This commit is contained in:
Laurent Destailleur 2006-04-06 21:41:39 +00:00
parent ec00465b16
commit b2962e9a4a
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/bank/ligne.php
View File

@ -340,6 +340,12 @@ if ($result)
print $langs->trans("Payment"); print $langs->trans("Payment");
print '</a>'; print '</a>';
} }
else if ($links[$key]['type']=='payment_supplier') {
print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowPayment'),'payment').' ';
print $langs->trans("Payment");
print '</a>';
}
else if ($links[$key]['type']=='company') { else if ($links[$key]['type']=='company') {
print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$links[$key]['url_id'].'">'; print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$links[$key]['url_id'].'">';
print img_object($langs->trans('ShowCustomer'),'company').' '; print img_object($langs->trans('ShowCustomer'),'company').' ';

2
htdocs/fourn/facture/paiement.php
View File

@ -147,7 +147,7 @@ if ($action == 'add_paiement')
$paiement_id, $paiement_id,
DOL_URL_ROOT.'/fourn/paiement/fiche.php?id=', DOL_URL_ROOT.'/fourn/paiement/fiche.php?id=',
'(paiement)', '(paiement)',
'payment'); 'payment_supplier');
$acc->add_url_line($bank_line_id, $acc->add_url_line($bank_line_id,
$fac->fournisseur->id, $fac->fournisseur->id,
DOL_URL_ROOT.'/fourn/fiche.php?socid=', DOL_URL_ROOT.'/fourn/fiche.php?socid=',

4
htdocs/fourn/facture/paiementfourn.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -240,7 +240,7 @@ class PaiementFourn
} }
// Vérifier si paiement ne porte pas sur ecriture bancaire rapprochée // Vérifier si paiement ne porte pas sur ecriture bancaire rapprochée
// Si c'est le cas, on refuse le paiement // Si c'est le cas, on refuse le delete
if ($bank_line_id) if ($bank_line_id)
{ {
$accline = new AccountLine($this->db,$bank_line_id); $accline = new AccountLine($this->db,$bank_line_id);

4
htdocs/fourn/paiement/fiche.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -44,6 +45,7 @@ $mesg='';
/* /*
* Actions * Actions
*/ */
if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes' && $user->rights->facture->creer) if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes' && $user->rights->facture->creer)
{ {
$db->begin(); $db->begin();
@ -54,7 +56,7 @@ if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes' && $user-
if ($result > 0) if ($result > 0)
{ {
$db->commit(); $db->commit();
Header('Location: /fourn/facture/paiement.php'); Header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
exit; exit;
} }
else else

5
mysql/migration/2.0.0-2.1.0.sql
View File

@ -118,4 +118,7 @@ drop table if exists llx_soc_recontact;
update llx_const set name='MAIN_SIZE_LISTE_LIMIT' where name='SIZE_LISTE_LIMIT'; update llx_const set name='MAIN_SIZE_LISTE_LIMIT' where name='SIZE_LISTE_LIMIT';
update llx_const set name='SOCIETE_FISCAL_MONTH_START' where name='FISCAL_MONTH_START'; update llx_const set name='SOCIETE_FISCAL_MONTH_START' where name='FISCAL_MONTH_START';
alter table llx_paiementfourn add statut smallint(6) NOT NULL DEFAULT 0; alter table llx_paiementfourn add statut smallint(6) NOT NULL DEFAULT 0;
update llx_bank_url set type = 'payment_supplier' where label = '(paiement)' and type='payment' and url like '%/fourn/%';