diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 498c0844d..0cf159ab0 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -2596,6 +2596,7 @@ span.warning { * Tabs like row ****************************************************************************/ #tab_id { + margin-top:1rem; margin-bottom: 30px; position:static; } diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php index f942bb5da..a60f08d2c 100644 --- a/include/class/acc_ledger.class.php +++ b/include/class/acc_ledger.class.php @@ -3249,6 +3249,10 @@ class Acc_Ledger extends jrn_def_sql } return ""; } + function input_extra_info() + { + require NOALYSS_TEMPLATE."/acc_ledger-input_extra_info.php"; + } } ?> diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php index 9d5701ed1..ba789acfd 100644 --- a/include/class/acc_operation.class.php +++ b/include/class/acc_operation.class.php @@ -185,7 +185,7 @@ class Acc_Operation { $this->type=($this->type=='d')?'c':'d'; } - if ( DEBUGNOALYSS > 0 ) { + if ( DEBUGNOALYSS > 1 ) { echo "insert_jrnx = [{ $this->poste}] {$this->amount} rounded ".round($this->amount,2)." type {$this->type}
"; } $this->amount=abs($this->amount); @@ -282,7 +282,7 @@ class Acc_Operation function insert_jrn() { $p_comment=$this->desc; - if ( DEBUGNOALYSS > 0 ) { + if ( DEBUGNOALYSS > 1 ) { echo "insert_jrn = {$this->amount}
"; } $diff=$this->db->get_value("select check_balance ($1)",array($this->grpt)); diff --git a/include/class/print_ledger_fin.class.php b/include/class/print_ledger_fin.class.php index 605fb8b63..cf4827b16 100644 --- a/include/class/print_ledger_fin.class.php +++ b/include/class/print_ledger_fin.class.php @@ -65,7 +65,7 @@ class Print_Ledger_Financial extends Print_Ledger $this->Cell(10,6,_('Interne')); $this->Cell(40,6,_('Dest/Orig')); $this->Cell(60,6,_('Commentaire')); - $this->Cell(20,6,_('Device'),0,0,'R'); + $this->Cell(20,6,_('Devise'),0,0,'R'); $this->Cell(20,6,_('Montant'),0,0,'R'); $this->Ln(6); diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index 22c3e8be8..eb39c7c33 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -22,7 +22,7 @@ /** *\file - * \brief file included to manage all the sold operation + * \brief file included include the purchase operation */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); $gDossier = dossier::id(); @@ -73,50 +73,12 @@ if (isset($_POST['view_invoice'])) echo $Ledger->confirm($_POST); echo HtmlInput::hidden('ac', $ac); - ?> -
- - -
-select_depot(false, -1); - echo $Ledger->extra_info(); - - echo ''; - - - echo ''; - - echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); + $Ledger->input_extra_info(); + echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); echo HtmlInput::submit('correct', _("Corriger")); echo ''; - echo ''; /* tab_id */ - echo ''; - ?> - -'; + if (DEBUGNOALYSS>1) { echo "";} return; } } diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 6e52c114c..f563fb9a0 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -33,6 +33,7 @@ $http=new HttpInput(); $strac=$http->request('ac'); $ac="ac=".$strac; $p_msg=""; +$post_jrn=$http->post("p_jrn", "string",""); //---------------------------------------------------------------------- // Encode a new invoice // empty form for encoding @@ -78,51 +79,13 @@ $p_msg=""; echo '
'; echo dossier::hidden(); echo $Ledger->confirm($_POST ); - echo HtmlInput::hidden('ac',$_REQUEST['ac']); - ?> -
- - -
-select_depot(false, -1); - echo $Ledger->extra_info(); - echo ''; - - - echo ''; - - echo HtmlInput::hidden('ac',$_REQUEST['ac']); - echo HtmlInput::submit("record",_("Enregistrement"),'onClick="return verify_ca(\'\');"'); - echo HtmlInput::submit('correct',_("Corriger")); + echo HtmlInput::hidden('ac',$strac); + $Ledger->input_extra_info(); + echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return verify_ca(\'\');"'); + echo HtmlInput::submit('correct', _("Corriger")); echo '
'; echo ''; - echo ''; /* tab_id */ -?> - -1) { echo "";} return; } } @@ -133,14 +96,14 @@ show_tabs(a_tab,'facturation_div_id'); if ( isset($_POST['record']) ) { // Check privilege - if ( $g_user->check_jrn($_REQUEST['p_jrn']) != 'W' ) + if ( $g_user->check_jrn($post_jrn) != 'W' ) { NoAccess(); exit -1; } - $Ledger=new Acc_Ledger_Sold($cn,$_POST['p_jrn']); + $Ledger=new Acc_Ledger_Sold($cn,$post_jrn); try { $Ledger->verify_operation($_POST); diff --git a/include/operation_ods_confirm.inc.php b/include/operation_ods_confirm.inc.php index 1bc569e74..fff8de6be 100644 --- a/include/operation_ods_confirm.inc.php +++ b/include/operation_ods_confirm.inc.php @@ -40,56 +40,7 @@ echo ''; echo '
'; echo HtmlInput::request_to_hidden(array('ac','p_currency_code','p_currency_rate')); echo $ledger->confirm($_POST,false); - - -?> -
- - -
-
-
- -
- - - -
- -input_extra_info(); echo HtmlInput::submit("save",_("Confirmer")); echo HtmlInput::submit("correct",_("Corriger")); diff --git a/include/template/form_ledger_detail.php b/include/template/form_ledger_detail.php index 84bbf0567..4e12bd65a 100644 --- a/include/template/form_ledger_detail.php +++ b/include/template/form_ledger_detail.php @@ -1,7 +1,10 @@

get_name()?>