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

Fix: Invoice is closed when built from point of ale

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-13 22:45:47 +00:00
parent e6d85a7e66
commit c048321f13
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/cashdesk/validation_verif.php
View File

@ -66,6 +66,8 @@ switch ( $_GET['action'] )
$encaisse = $obj_facturation->montant_encaisse(); $encaisse = $obj_facturation->montant_encaisse();
$obj_facturation->montant_rendu ( $encaisse - $total ); $obj_facturation->montant_rendu ( $encaisse - $total );
} else { } else {
$obj_facturation->paiement_le ($_POST['txtDatePaiement']); $obj_facturation->paiement_le ($_POST['txtDatePaiement']);
} }
@ -266,6 +268,18 @@ switch ( $_GET['action'] )
$errmsg=$paiement->error; $errmsg=$paiement->error;
$error++; $error++;
} }
}
if (! $error)
{
if ($invoice->total_ttc == $obj_facturation->prix_total_ttc()
&& $obj_facturation->mode_reglement() != 'DIFF')
{
// We set status to payed
$result=$invoice->set_paid($user);
//print 'eeeee';exit;
}
} }
} }
else else

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

@ -70,7 +70,7 @@ $mesg='';
*/ */
$dateop=-1; $dateop=-1;
if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user->rights->banque->modifier) if ($action == 'add' && $account && ! isset($_POST["cancel"]) && $user->rights->banque->modifier)
{ {
if (price2num($_POST["credit"]) > 0) if (price2num($_POST["credit"]) > 0)
@ -99,7 +99,7 @@ if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user-
$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user); $insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
if ($insertid > 0) if ($insertid > 0)
{ {
Header("Location: account.php?account=" . $account); Header("Location: account.php?account=" . $account."&action=addline");
exit; exit;
} }
else else
@ -109,10 +109,10 @@ if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user-
} }
else else
{ {
$_GET["action"]='addline'; $action='addline';
} }
} }
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"]=='yes' && $user->rights->banque->modifier) if ($action == 'confirm_delete' && $_POST["confirm"]=='yes' && $user->rights->banque->modifier)
{ {
$accline=new AccountLine($db); $accline=new AccountLine($db);
$accline->fetch($_GET["rowid"]); $accline->fetch($_GET["rowid"]);
@ -329,7 +329,7 @@ if ($account || $_GET["ref"])
// Confirmation delete // Confirmation delete
if ($_GET["action"]=='delete') if ($action == 'delete')
{ {
$text=$langs->trans('ConfirmDeleteTransaction'); $text=$langs->trans('ConfirmDeleteTransaction');
$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?account='.$acct->id.'&rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete'); $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?account='.$acct->id.'&rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete');
@ -340,14 +340,14 @@ if ($account || $_GET["ref"])
print '<table class="notopnoleftnoright" width="100%">'; print '<table class="notopnoleftnoright" width="100%">';
// Show title // Show title
if (! $_GET["action"]=='addline' && ! $_GET["action"]=='delete') if ($action != 'addline' && $action =='delete')
{ {
print '<tr><td colspan="9" align="right">'.$navig.'</td></tr>'; print '<tr><td colspan="9" align="right">'.$navig.'</td></tr>';
} }
// Form to add a transaction with no invoice // Form to add a transaction with no invoice
if ($user->rights->banque->modifier && $_GET["action"]=='addline') if ($user->rights->banque->modifier && $action == 'addline')
{ {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -742,7 +742,8 @@ if ($account || $_GET["ref"])
/* /*
* Boutons actions * Boutons actions
*/ */
if ($_GET["action"] != 'addline' && $_GET["action"] != 'delete')
if ($action != 'delete')
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
@ -758,6 +759,8 @@ if ($account || $_GET["ref"])
} }
} }
if ($action != 'addline')
{
if ($user->rights->banque->modifier) if ($user->rights->banque->modifier)
{ {
print '<a class="butAction" href="account.php?action=addline&amp;account='.$acct->id.'&amp;page='.$page.'">'.$langs->trans("AddBankRecord").'</a>'; print '<a class="butAction" href="account.php?action=addline&amp;account='.$acct->id.'&amp;page='.$page.'">'.$langs->trans("AddBankRecord").'</a>';
@ -766,6 +769,7 @@ if ($account || $_GET["ref"])
{ {
print "<a class=\"butActionRefused\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("AddBankRecord")."</a>"; print "<a class=\"butActionRefused\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("AddBankRecord")."</a>";
} }
}
print '</div>'; print '</div>';
} }