admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency

Browse source
This commit is contained in:
Dany De Bontridder 2019-01-27 21:06:06 +01:00
commit 3f56012389
6 changed files with 103 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
include/anc_pa.inc.php
View file

@ -83,24 +83,13 @@ if ($sa=="pa_write")
else
{
$new=new Anc_Plan($cn);
$new->name=$_POST['pa_name'];
$new->description=$_POST['pa_description'];
$new->name=$http->post("pa_name");
$new->description=$http->post("pa_description");
$new->add();
}
$sa="anc_menu";
}
// Update the PA
if ($sa=="pa_update")
{
$pa_id=$http->get("pa_id","number");
$new=new Anc_Plan($cn, $pa_id);
$new->name=$_POST['pa_name'];
$new->description=$_POST['pa_description'];
$new->update();
$sa="anc_menu";
}
/* delete pa */
if ($sa=="pa_delete")
@ -120,19 +109,25 @@ if ($sa=="pa_detail")
$pa_id=$http->get("pa_id","number");
$new=new Anc_Plan($cn, $pa_id);
$wSa=HtmlInput::hidden("sa", "pa_update");
$new->get();
$ret.= '<div class="content">';
$ret.= $new->form();
$ret.= $wSa;
$ret.="<p>";
// Export in CSV
$ret.='<form method="GET" action="export.php" style="display:inline">';
$ret.=Dossier::hidden();
$ret.=HtmlInput::hidden("act",'CSV:Analytic_Axis');
$ret.=HtmlInput::hidden("pa_id",$pa_id);
$ret.=HtmlInput::submit('export_analytic_axis',_("Export CSV"));
$ret.='</form>';
$ret.=HtmlInput::button_anchor(_('Efface ce plan'), '', 'remove_analytic_plan',
'onclick="return confirm_box(\'remove_analytic_plan\',\'Effacer ?\',function () {window.location=\'do.php?ac='.$_REQUEST['ac'].'&pa_id='.$_GET['pa_id'].'&sa=pa_delete&'.$str_dossier.'\';})"',
'smallbutton');
$ret.="</p>";
$ret.='</div>';
//---------------------------------------------------------------------
// Detail now
// Use Manage_Table
@ -141,7 +136,7 @@ if ($sa=="pa_detail")
$new=new Anc_Plan($cn, $pa_id);
$new->get();
$ret.='<div class="content">';
$ret.='<div class="content" style="margin-top:1rem">';
$anc=new Poste_analytique_SQL($cn);
$anc->pa_id=$pa_id;
$accounting=new Anc_Account_Table($anc);

2
include/constant.php
View file

@ -108,7 +108,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
if ( ! defined ("SYSINFO_DISPLAY")) {
define ("SYSINFO_DISPLAY",TRUE);
}
define ("DBVERSION",133);
define ("DBVERSION",134);
define ("MONO_DATABASE",25);
define ("DBVERSIONREPO",18);
define ('NOTFOUND','--not found--');

60
include/export/export_anc_axis_csv.php Normal file
View file

@ -0,0 +1,60 @@
<?php
/*
* This file is part of NOALYSS.
*
* NOALYSS is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* NOALYSS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with NOALYSS; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
// Copyright Author Dany De Bontridder danydb@aevalys.eu
/**
* @file
* Export ANALYTIC Axis in CSV
*/
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
$http=new HttpInput();
$pa_id=$http->get("pa_id","number");
$name=$cn->get_value("select pa_name from plan_analytique where pa_id=$1",
[$pa_id]);
$array=$cn->get_array(" select
po_name,
po_amount,
po_description,
ga_description
from
poste_analytique
left join groupe_analytique using (ga_id)
where poste_analytique.pa_id=$1 order by po_name asc ",[$pa_id]);
$output=new Noalyss_Csv($name);
$output->send_header();
$output->write_header([
_("Nom"),
_("Description"),
_("Montant"),
_("Groupe"),
]);
if ($array != FALSE )
{
$nb_array=count($array);
for ($i=0;$i<$nb_array;$i++) {
$output->add($array[$i]['po_name']);
$output->add($array[$i]['po_description']);
$output->add($array[$i]['po_amount'],"number");
$output->add($array[$i]['ga_description']);
$output->write();
}
}

19
include/history_operation.inc.php
View file

@ -94,7 +94,7 @@ if (!isset($p_array['date_start']))
list($date_start, $date_end) = $per->get_date_limit();
$p_array['date_start'] = $date_start;
$p_array['date_end'] = $date_end;
$msg='<h2 class="info2">'._("Période ").$date_start._(" au ").$date_end.'</h2>';
$msg='<h2 class="info2">'.sprintf(_("Période %s au %s "),$date_start,$date_end).'</h2>';
}
else
{
@ -138,11 +138,17 @@ $r = HtmlInput::get_to_hidden(array('search_opnb_jrn',
'unpaid',
'gDossier',
'ledger_type',
'p_action'));
'p_action',
'search_opr_jrn'));
if (isset($_GET['r_jrn']))
{
foreach ($_GET['r_jrn'] as $k => $v)
$r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v);
foreach ($_GET['r_jrn'] as $k => $v)
$r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v);
}
if (isset($_GET['search_opr_jrn']))
{
foreach ($_GET['search_opr_jrn'] as $k => $v)
$r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v);
}
echo $r;
@ -156,6 +162,11 @@ echo '</form>';
$r = HtmlInput::get_to_hidden(array('l', 'date_paid_start','date_paid_end',
'date_start', 'date_end', 'desc', 'amount_min', 'amount_max', 'qcode',
'accounting', 'unpaid', 'gDossier', 'ledger_type', 'p_action'));
if (isset($_GET['search_opr_jrn']))
{
foreach ($_GET['search_opr_jrn'] as $k => $v)
$r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v);
}
if (isset($_GET['r_jrn']))
{
foreach ($_GET['r_jrn'] as $k => $v)

2
include/sql/patch/upgrade132.sql
View file

@ -10,6 +10,6 @@ operation_currency
join jrnx using (j_id)
group by f_id,j_id;
commit ;
insert into version (val,v_description) values (133,'Currency : default accounting for currency difference ');
commit ;

13
include/sql/patch/upgrade133.sql Normal file
View file

@ -0,0 +1,13 @@
begin;
INSERT INTO public.menu_ref
(me_code, me_menu, me_file, me_url, me_description, me_parameter, me_javascript, me_type, me_description_etendue)
VALUES('CSV:Analytic_Axis', 'Export ANC', 'export_anc_axis_csv.php', NULL, 'Export ANC Liste comptes', NULL, NULL, 'PR', NULL);
insert into profile_menu (me_code,p_id,p_type_display) select distinct 'CSV:Analytic_Axis', p_id, 'P' from profile_menu
where
p_id in (select distinct p_id from profile_menu where me_code='PLANANC');
insert into version (val,v_description) values (134,'Export CSV:Analytic_Axis');
commit ;