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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-16 18:36:03 +01:00
commit 826a5f80e9
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/comm/propal.php
View File

@ -843,7 +843,7 @@ else if ($action == "addline" && $user->rights->propale->creer)
} }
// Mise a jour d'une ligne dans la propale // Mise a jour d'une ligne dans la propale
if ($action == 'updateligne' && $user->rights->propale->creer && $_POST["save"] == $langs->trans("Save")) else if ($action == 'updateligne' && $user->rights->propale->creer && $_POST["save"] == $langs->trans("Save"))
{ {
if (! $object->fetch($_POST["id"]) > 0) if (! $object->fetch($_POST["id"]) > 0)
{ {
@ -950,28 +950,28 @@ else if ($action == 'builddoc' && $user->rights->propale->creer)
} }
// Set project // Set project
else if ($action == 'classin') else if ($action == 'classin' && $user->rights->propale->creer)
{ {
$object->fetch($id); $object->fetch($id);
$object->setProject($_POST['projectid']); $object->setProject($_POST['projectid']);
} }
// Delai de livraison // Delai de livraison
else if ($action == 'setavailability') else if ($action == 'setavailability' && $user->rights->propale->creer)
{ {
$object->fetch($id); $object->fetch($id);
$result = $object->availability($_POST['availability_id']); $result = $object->availability($_POST['availability_id']);
} }
// Origine de la propale // Origine de la propale
else if ($action == 'setdemandreason') else if ($action == 'setdemandreason' && $user->rights->propale->creer)
{ {
$object->fetch($id); $object->fetch($id);
$result = $object->demand_reason($_POST['demand_reason_id']); $result = $object->demand_reason($_POST['demand_reason_id']);
} }
// Conditions de reglement // Conditions de reglement
else if ($action == 'setconditions') else if ($action == 'setconditions' && $user->rights->propale->creer)
{ {
$object->fetch($id); $object->fetch($id);
$result = $object->setPaymentTerms(GETPOST('cond_reglement_id','int')); $result = $object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
@ -990,7 +990,7 @@ else if ($action == 'setremiseabsolue' && $user->rights->propale->creer)
} }
// Mode de reglement // Mode de reglement
else if ($action == 'setmode') else if ($action == 'setmode' && $user->rights->propale->creer)
{ {
$object->fetch($id); $object->fetch($id);
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int')); $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
@ -1090,25 +1090,25 @@ if ($id > 0 || ! empty($ref))
} }
// Confirm delete // Confirm delete
if ($action == 'delete') else if ($action == 'delete')
{ {
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp',$object->ref), 'confirm_delete','',0,1); $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp',$object->ref), 'confirm_delete','',0,1);
} }
// Confirm reopen // Confirm reopen
if ($action == 'reopen') else if ($action == 'reopen')
{ {
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp',$object->ref), 'confirm_reopen','',0,1); $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp',$object->ref), 'confirm_reopen','',0,1);
} }
// Confirmation delete product/service line // Confirmation delete product/service line
if ($action == 'ask_deleteline') else if ($action == 'ask_deleteline')
{ {
$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1); $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
} }
// Confirm validate proposal // Confirm validate proposal
if ($action == 'validate') else if ($action == 'validate')
{ {
$error=0; $error=0;

1
htdocs/comm/propal/class/propal.class.php
View File

@ -1575,6 +1575,7 @@ class Propal extends CommonObject
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
$this->statut = 0;
return 1; return 1;
} }
else else

4
htdocs/core/tpl/freeproductline_edit.tpl.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2010-2012 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
@ -34,7 +34,7 @@
<input type="hidden" name="type" value="<?php echo $line->product_type; ?>"> <input type="hidden" name="type" value="<?php echo $line->product_type; ?>">
<tr <?php echo $bc[$var]; ?>> <tr <?php echo $bc[$var]; ?>>
<td> <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
<a name="<?php echo $line->id; ?>"></a> <a name="<?php echo $line->id; ?>"></a>
<?php <?php

2
htdocs/core/tpl/predefinedproductline_edit.tpl.php
View File

@ -33,7 +33,7 @@
<input type="hidden" name="lineid" value="<?php echo $line->id; ?>" /> <input type="hidden" name="lineid" value="<?php echo $line->id; ?>" />
<tr <?php echo $bc[$var]; ?>> <tr <?php echo $bc[$var]; ?>>
<td> <td<?php echo (! empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
<a name="<?php echo $line->id; ?>"></a> <a name="<?php echo $line->id; ?>"></a>
<input type="hidden" name="productid" value="<?php echo $line->fk_product; ?>" /> <input type="hidden" name="productid" value="<?php echo $line->fk_product; ?>" />
<a href="<?php echo DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product; ?>"> <a href="<?php echo DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product; ?>">