';
+ // Ask to update payment
+ if ( isset ( $_GET['paid']))
+ {
+ // reset all the paid flag because the checkbox is post only
+ // when checked
+ foreach ($_GET as $name=>$paid)
+ {
+ list($ad) = sscanf($name,"set_jr_id%d");
+ if ( $ad == null ) continue;
+ $sql="update jrn set jr_rapt='' where jr_id=$ad";
+ $Res=ExecSql($cn,$sql);
+
+ }
+ // set a paid flag for the checked box
+ foreach ($_GET as $name=>$paid)
+ {
+ list ($id) = sscanf ($name,"rd_paid%d");
+
+ if ( $id == null ) continue;
+ // echo "Mise à jour $id";
+ $paid=($paid=='on')?'paid':'';
+ $sql="update jrn set jr_rapt='$paid' where jr_id=$id";
+ $Res=ExecSql($cn,$sql);
+ }
+
+ }
+
+ echo '
';
+////////////////////////////////////////////////////////////////////////////////
+// if we request to add an item
+// the $_POST['add_item'] is set
+// or if we ask to correct the invoice
+if ( isset ($_POST['add_item']) || isset ($_POST["correct_new_invoice"]) )
+{
+ $nb_item=$_POST['nb_item'];
+ $nb_item++;
+ // Submit button in the form
+ $submit='
+ ';
+
+ $form=FormAchInput($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,$submit,false,$nb_item);
+ echo '
';
+ echo $form;
+ echo '
';
+ exit();
+}
+////////////////////////////////////////////////////////////////////////////////
+// we want to save the invoice and to generate a invoice
+//
+if ( isset($_POST['save']))
+{
+ // we save the expense
+ list ($internal,$c)=RecordSell($cn,$_POST,$User,$p_jrn);
+
+
+ $form=FormAchView($cn,$_GET['p_jrn'],$User->GetPeriode(),$_POST,"",$_POST['nb_item'],false);
+
+ echo '
';
+ echo '
Opération '.$internal.' enregistré
';
+ echo $form;
+ echo '';
+ echo '';
+ echo '
+ ';
+ exit();
+}
+////////////////////////////////////////////////////////////////////////////////
+// we show the confirmation screen
+//
+if ( isset ($_POST['view_invoice']) )
+{
+ $nb_number=$_POST["nb_item"];
+ $submit='';
+ $submit.='';
+ if ( form_verify_input ($cn,$p_jrn,$User->GetPeriode(),$_POST,$nb_number) == true ) {
+ // Should use a read only view instead of FormAch
+ // where we can check
+ $form=FormAchView($cn,$p_jrn,$User->GetPeriode(),$_POST,$submit,$nb_number);
+ } else {
+ // if something goes wrong, correct it
+ $submit='
+ ';
+ $form=FormAchInput($cn,$p_jrn,$User->GetPeriode(),$_POST,$submit, false, $nb_number);
+ }
+
+ echo '
';
+ echo $form;
+ echo '
';
+ exit();
+
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// By default we add a new invoice
+if ( $p_jrn != -1 )
+{
+ $jrn=new jrn($cn, $p_jrn);
+ echo_debug('depense.inc.php',__LINE__,"Blank form");
+ // Submit button in the form
+ $submit='
+ ';
+ // Show an empty form of invoice
+ $form=FormAchInput($cn,$p_jrn,$User->GetPeriode(),null,$submit,false,$jrn->getDefLine('cred'));
+ echo '
';
+ echo $form;
+ echo '
';
+}
diff --git a/include/facture.inc.php b/include/facture.inc.php
index f20c13596..b6773d820 100644
--- a/include/facture.inc.php
+++ b/include/facture.inc.php
@@ -26,13 +26,6 @@ require_once("class_fiche.php");
/*!\brief the purpose off this file is to create invoices, to record them and to generate
* them, and of course to save them into the database
*
- * \note we update also the jrn.
- * jr_pj oid
- * jr_pj_name text
- * jr_pj_type text
- * \todo link the table document and jrn, remove those field to make it cleaner and to permit to
- * several operation for one document. For that we should have a new item in the menu (link
- * document and operation) To be analyzed
*/
var_dump($_REQUEST);
@@ -40,24 +33,22 @@ var_dump($_REQUEST);
// If nothing is asked the propose a blank form
// to enter a new invoice
if ( ! isset ($_REQUEST['p_jrn'])) {
- // no journal are selected so we select the first one
- // $p_jrn=GetFirstJrnIdForJrnType($_SESSION['g_dossier'],'VEN');
- $p_jrn=-1;
+ // no journal are selected so we select the first one
+ $p_jrn=GetFirstJrnIdForJrnType($_SESSION['g_dossier'],'VEN');
+ // $p_jrn=-1;
} else
{
$p_jrn=$_REQUEST['p_jrn'];
}
// for the back button
+$retour="";
+$h_url="";
+
if ( isset ($_REQUEST['url']))
{
$retour=sprintf('',urldecode($_REQUEST['url']));
$h_url=sprintf('',urldecode($_REQUEST['url']));
}
-else
-{
- $retour="";
- $h_url="";
-}
$sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
////////////////////////////////////////////////////////////////////////////////
@@ -68,7 +59,7 @@ if ( $sub_action == "list")
// show the menu with the list item selected
echo '