From b721ee7d11e13c2b1aa805a86f25e01d9dfbfb4d Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 2 Nov 2011 23:05:52 +0000 Subject: [PATCH] =?UTF-8?q?412:=20r=C3=A9=C3=A9criture=20ACH=20+=20VEN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/class_acc_ledger_sold.php | 28 ++++++---- include/compta_ach.inc.php | 2 + include/compta_ven.inc.php | 93 +++++++++++-------------------- 3 files changed, 50 insertions(+), 73 deletions(-) diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index a63de7fbf..c952e7351 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -608,15 +608,17 @@ class Acc_Ledger_Sold extends Acc_Ledger echo "

Acc_Ledger_Sold::delete Not implemented

"; } - /*!\brief show the summary of the operation and propose to save it - *\param array contains normally $_POST. It proposes also to save + /*!@brief show the summary of the operation and propose to save it + *@param array contains normally $_POST. It proposes also to save * the Analytic accountancy - *\return string + *@return string */ - function confirm($p_array) + function confirm($p_array,$p_summary=false) { extract ($p_array); - $this->verify($p_array) ; + + // don't need to verify for a summary + if ( ! $p_summary ) $this->verify($p_array) ; $anc=null; // to show a select list for the analytic & VAT USE // if analytic is op (optionnel) there is a blank line @@ -761,7 +763,7 @@ class Acc_Ledger_Sold extends Acc_Ledger $anc_op=new Anc_Operation($this->db); $null=($owner->MY_ANALYTIC=='op')?1:0; $r.=''; - $p_mode=1; + $p_mode=($p_summary==false)?1:0; $p_array['pa_id']=$a_anc; /* op is the operation it contains either a sequence or a jrnx.j_id */ $r.=HtmlInput::hidden('op[]=',$i); @@ -777,12 +779,15 @@ class Acc_Ledger_Sold extends Acc_Ledger $r.=''; if ( $owner->MY_ANALYTIC!='nu') // use of AA - $r.=''; + $r.=''; $r.=''; - $r.=$this->extra_info(); - - - $r.='
'; + if (! $p_summary ) + { + $r.=$this->extra_info(); + $r.='
'; + } + else + $r.='
'; $r.='
Totaux'; $tot=round(bcadd($tot_amount,$tot_tva),2); $r.='
'; @@ -1039,6 +1044,7 @@ class Acc_Ledger_Sold extends Acc_Ledger $add_js="update_pj();"; } $add_js.='get_last_date();'; + $add_js.='update_name();'; $wLedger=$this->select_ledger('VEN',2); if ( $wLedger == null ) diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index 5d97a180a..07397138e 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -184,6 +184,8 @@ $op->set('direct', 'f'); echo $op->form_get(); echo ''; +echo '
'; +echo '
'; echo "
"; /* request for a predefined operation */ if (isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && !isset($_POST['correct'])) diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 6adde61f5..6d2d8ede0 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -30,50 +30,18 @@ require_once ('class_document.php'); require_once ('class_acc_ledger_info.php'); require_once('class_ipopup.php'); -$p_action=(isset($_REQUEST['p_action']))?$_REQUEST['p_action']:''; $gDossier=dossier::id(); $cn=new Database(dossier::id()); //menu = show a list of ledger $str_dossier=dossier::get(); $ac="ac=".$_REQUEST['ac']; -$array=array( - array('?ledger_type=ven&sa=n&'.$str_dossier."&$ac",_('Nouvelle vente'),_('Nouvelle vente'),1), - array('?ledger_type=ven&sa=l&'.$str_dossier."&$ac",_('Liste ventes'),_('Liste des ventes'),2), - array('?ledger_type=ven&sa=lnp&'.$str_dossier."&$ac",_('Liste vente non payées'),_('Liste des ventes non payées'),3) - ); - -$sa=(isset ($_REQUEST['sa']))?$_REQUEST['sa']:-1; -$def=1; -switch ($sa) -{ -case 'n': - $def=1; - $use_predef=0; - break; -case 'p': - $def=1; - $use_predef=1; - break; -case 'l': - $def=2; - break; -case 'lnp': - $def=3; - break; -} - -echo '
'; -echo ShowItem($array,'H','mtitle','mtitle',$def); -echo '
'; -$href=basename($_SERVER['PHP_SELF'])."?$ac&$str_dossier"; //---------------------------------------------------------------------- // Encode a new invoice // empty form for encoding //---------------------------------------------------------------------- -if ( $def==1 || $def == 4 ) -{ + $Ledger=new Acc_Ledger_Sold($cn,0); // Check privilege @@ -102,13 +70,13 @@ if ( $def==1 || $def == 4 ) if ( ! isset($correct)) { echo '
'; - - echo ''; - echo HtmlInput::hidden('sa','n'); - echo HtmlInput::hidden('p_action','ven'); + echo h2info('Confirmation'); + echo '

' . $Ledger->get_name() . '

'; + echo '
'; + echo ''; echo dossier::hidden(); echo $Ledger->confirm($_POST ); - + echo HtmlInput::hidden('ac',$_REQUEST['ac']); $chk=new ICheckBox(); $chk->selected=false; echo '
'; @@ -124,6 +92,7 @@ if ( $def==1 || $def == 4 ) echo HtmlInput::submit('correct',_("Corriger")); echo ''; + echo '
'; echo '
'; exit(); } @@ -156,6 +125,7 @@ if ( $def==1 || $def == 4 ) if ( ! isset($correct)) { echo '
'; + echo '

' . $Ledger->get_name() . '

'; $Ledger=new Acc_Ledger_Sold($cn,$_POST['p_jrn']); $internal=$Ledger->insert($_POST); @@ -168,7 +138,7 @@ if ( $def==1 || $def == 4 ) } /* Show button */ - echo '

'.$Ledger->get_name().'

'; + echo '

'; $jr_id=$cn->get_value('select jr_id from jrn where jr_internal=$1',array($internal)); echo "

"._('Opération sauvée'); @@ -181,11 +151,11 @@ if ( $def==1 || $def == 4 ) printf ('%s
', $jr_id,dossier::id(),$internal); + echo $Ledger->confirm($_POST,true); /* Show link for Invoice */ if (isset ($Ledger->doc) ) { echo $Ledger->doc; - echo '
'; } @@ -194,7 +164,6 @@ if ( $def==1 || $def == 4 ) $obj->save_extra($Ledger->jr_id,$_POST); - echo HtmlInput::button_anchor(_('Nouvelle vente'),$href.'?p_action=ven&sa=n&'.dossier::get()); echo '

'; exit(); } @@ -203,9 +172,6 @@ if ( $def==1 || $def == 4 ) /* Display a blank form or a form with predef operation */ // ------------------------------ - echo '
'; - echo "
"; - $array=(isset($_POST['correct'])||isset ($correct))?$_POST:null; $Ledger=new Acc_Ledger_Sold($cn,0); // @@ -220,11 +186,24 @@ if ( $def==1 || $def == 4 ) else $Ledger->id=$_REQUEST ['p_jrn']; + echo '
'; + echo '

' . $Ledger->get_name() . '

'; + echo ''; + echo HtmlInput::hidden('ac',$_REQUEST['ac']); + echo dossier::hidden(); + echo HtmlInput::hidden('p_jrn_predef',$Ledger->id); + $op=new Pre_op_ven($cn); + $op->set('ledger',$Ledger->id); + $op->set('ledger_type',"VEN"); + $op->set('direct','f'); + echo $op->form_get(); + echo ''; + echo '
'; - - + echo '
'; + echo "
"; /* request for a predefined operation */ - if ( isset($use_predef) && $use_predef == 1 && isset($_REQUEST['pre_def']) ) + if ( isset($_REQUEST['pre_def']) && ! isset($_POST['correct']) ) { // used a predefined operation // @@ -260,29 +239,19 @@ if ( $def==1 || $def == 4 ) echo HtmlInput::reset(_('Effacer ')); echo '
'; echo ""; - echo '
'; - echo '
'; - echo HtmlInput::hidden("sa","p"); - echo HtmlInput::hidden("p_action","ven"); - echo dossier::hidden(); - echo HtmlInput::hidden('p_jrn_predef',$Ledger->id); - $op=new Pre_op_ven($cn); - $op->set('ledger',$Ledger->id); - $op->set('ledger_type',"VEN"); - $op->set('direct','f'); - echo $op->form_get(); - echo '
'; $own=new Own($cn); /* if we suggest the pj n# the run the script */ if ( $own->MY_PJ_SUGGEST=='Y') { echo ''; } - echo ''; - echo '
'; exit(); -} + + + +exit(); + //------------------------------------------------------------------------------- // Listing //--------------------------------------------------------------------------------