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

Fix: If ref not provided, form is shown again with correct supplier.

Browse Source
This commit is contained in:
Laurent Destailleur 2008-02-02 12:56:01 +00:00
parent c577ec60e9
commit 90e6824789
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/fourn/facture/fiche.php
View File

@ -18,15 +18,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/fourn/facture/fiche.php \file htdocs/fourn/facture/fiche.php
\ingroup facture, fournisseur \ingroup facture, fournisseur
\brief Page des la fiche facture fournisseur \brief Page for supplier invoice card
\version $Revision$ \version $Id$
*/ */
require_once('./pre.inc.php'); require_once('./pre.inc.php');
@ -126,27 +124,21 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer)
{ {
if ($_POST['facnumber']) if ($_POST['facnumber'])
{ {
$datefacture = mktime(12,0,0, $datefacture = dolibarr_mktime(12,0,0,
$_POST['remonth'], $_POST['remonth'],
$_POST['reday'], $_POST['reday'],
$_POST['reyear']); $_POST['reyear']);
$tva = 0;
$amo = price2num($_POST['amount']);
$tva = (price2num($_POST['tva_tx']) * $amo) / 100 ;
$remise = 0;
$total = $tva + $amo;
$db->begin(); $db->begin();
// Creation facture // Creation facture
$facfou = new FactureFournisseur($db); $facfou = new FactureFournisseur($db);
$facfou->ref = $_POST['facnumber']; $facfou->ref = $_POST['facnumber'];
$facfou->socid = $_POST['socid']; $facfou->socid = $_POST['socid'];
$facfou->libelle = $_POST['libelle']; $facfou->libelle = $_POST['libelle'];
$facfou->date = $datefacture; $facfou->date = $datefacture;
$facfou->date_echeance = mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']); $facfou->date_echeance = dolibarr_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
$facfou->note = $_POST['note']; $facfou->note = $_POST['note'];
$facid = $facfou->create($user); $facid = $facfou->create($user);
@ -182,6 +174,7 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer)
$db->rollback(); $db->rollback();
$mesg='<div class="error">'.$facfou->error.'</div>'; $mesg='<div class="error">'.$facfou->error.'</div>';
$_GET['action']='create'; $_GET['action']='create';
$_GET['socid']=$_POST['socid'];
} }
else else
{ {
@ -195,12 +188,14 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer)
$db->rollback(); $db->rollback();
$mesg='<div class="error">'.$facfou->error.'</div>'; $mesg='<div class="error">'.$facfou->error.'</div>';
$_GET['action']='create'; $_GET['action']='create';
$_GET['socid']=$_POST['socid'];
} }
} }
else else
{ {
$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Ref')).'</div>'; $mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Ref')).'</div>';
$_GET['action']='create'; $_GET['action']='create';
$_GET['socid']=$_POST['socid'];
} }
} }