[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] branch devel updated: Task #2134 : code clean
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] branch devel updated: Task #2134 : code cleaning , removed unused files |
Date: |
Sun, 06 Feb 2022 06:57:47 -0500 |
This is an automated email from the git hooks/post-receive script.
sparkyx pushed a commit to branch devel
in repository noalyss.
The following commit(s) were added to refs/heads/devel by this push:
new 28e428d7 Task #2134 : code cleaning , removed unused files
28e428d7 is described below
commit 28e428d7114b9d874c0eff29e660ce634f00c464
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Feb 6 12:27:00 2022 +0100
Task #2134 : code cleaning , removed unused files
---
include/template/forecast-detail.php | 34 ------
include/template/forecast_cat-delete.php | 30 -----
include/template/list_category_document.php | 49 --------
include/template/list_mod_payment.php | 86 --------------
include/template/operation_detail_ach.php | 126 --------------------
include/template/operation_detail_fin.php | 50 --------
include/template/operation_detail_misc.php | 87 --------------
include/template/operation_detail_ven.php | 109 ------------------
include/template/pcmn_update.php | 58 ----------
include/template/print_ledger_simple.php | 172 ----------------------------
include/template/profile_menu.php | 30 -----
include/template/tag_choose.php | 47 --------
12 files changed, 878 deletions(-)
diff --git a/include/template/forecast-detail.php
b/include/template/forecast-detail.php
deleted file mode 100644
index 2c440343..00000000
--- a/include/template/forecast-detail.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-//This file is part of NOALYSS and is under GPL
-//see licence.txt
-?>
-<h2><?php echo $str_name;?></h2>
-<fieldset>
-<legend><?php echo $str_action;?></legend>
-
-<table id="fortable">
-<tr>
-<th><?php echo _('Catégorie');?></th>
-<th style="width:40%"><?php echo _('Formules');?></th>
-<th><?php echo _('ou QuickCode');?></th>
-<th><?php echo _('Libellé');?></th>
-<th><?php echo _('Montant');?></th>
-<th><?php echo _('Débit ou Crédit');?></th>
-</tr>
-<?php for ($i=0;$i<count($aCat);$i++):?>
-<tr>
-<td><?php echo $aCat[$i]['cat'];?></td>
-<td><?php echo $aCat[$i]['account'];?></td>
-<td><?php echo $aCat[$i]['qc'];?></td>
-<td><?php echo $aCat[$i]['name'];?></td>
-<td><?php echo $aCat[$i]['per'];?></td>
-
-<td><?php echo $aCat[$i]['amount'];?></td>
-<td><?php echo $aCat[$i]['deb'];?></td>
-</tr>
-<?php endfor;?>
-</table>
-<?php echo $f_add_row ?>
-</fieldset>
-
-
diff --git a/include/template/forecast_cat-delete.php
b/include/template/forecast_cat-delete.php
deleted file mode 100644
index 757a7592..00000000
--- a/include/template/forecast_cat-delete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-//This file is part of NOALYSS and is under GPL
-//see licence.txt
-?><fieldset>
-<legend>
-<?php echo $str_action;?></legend>
-<?php echo $str_name;?>
-<?php echo _("Date de début")?> <?php echo $str_start_date?>
-<?php echo _("Date de fin")?> <?php echo $str_end_date ?>
-
-<h2> <?php echo _('Catégories');?></h2>
-<table>
-<tr>
-<th><?php echo _('Ordre');?></th>
-<th><?php echo _('Nom');?></th>
-</tr>
-<?php for ($i=0;$i<count($aCat);$i++):?>
-<tr>
-<td>
-<?php echo $aCat[$i]['order'];?>
-</td>
-<td>
-<?php echo $aCat[$i]['name'];?>
-</td>
-</tr>
-<?php endfor;?>
-</table>
-
-
-</fieldset>
\ No newline at end of file
diff --git a/include/template/list_category_document.php
b/include/template/list_category_document.php
deleted file mode 100644
index 13159b3e..00000000
--- a/include/template/list_category_document.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-//This file is part of NOALYSS and is under GPL
-//see licence.txt
-?><form method="post">
-
-<table>
-
-<?php
-for ($i=0;$i<count($aList);$i++) :
- $row=$aList[$i];
-?>
-
-<tr id="row<?php echo $row['dt_id']?>">
-<td colspan="2">
-<?php echo h($row['dt_value']);?>
-</td>
-<td colspan="2">
-<?php echo h($row['dt_prefix']);?>
-</td>
-<td>
-<?php echo $row['js_mod'];?>
-</td>
-<td>
-<?php echo $row['js_remove'];?>
-</td>
-
-
-</tr>
-<?php
-endfor;
-?>
-<tr>
-<td>
-<?php echo $str_addCat?>
-</td>
-<td>
-<?php echo $str_addPrefix?>
-</td>
-<td>
- <?php echo $str_submit?>
-</td>
-</tr>
-
-</table>
-<?php
-echo dossier::hidden();
-echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-?>
-</form>
\ No newline at end of file
diff --git a/include/template/list_mod_payment.php
b/include/template/list_mod_payment.php
deleted file mode 100644
index 5bd9a680..00000000
--- a/include/template/list_mod_payment.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/**
- * @file
- * @brief list payment method
- *
- */
-
-?>
- <table class="table_large" >
- <tr >
- <th>
- <?php echo $header->get_header(0)?>
- </th>
- <th style="text-align:center">
- <?php echo $header->get_header(1)?>
- </th>
- <th style="text-align:center">
- <?php echo $header->get_header(2)?>
- </th>
- <th style="text-align:center">
- <?php echo $header->get_header(3)?>
- </th>
- <th style="text-align:center">
- <?php echo $header->get_header(4)?>
- </th>
- <th>
-
- </th>
- </tr>
-<?php for ($i=0;$i<count($array);$i++):
- if ($i%2==0):
- $class='class="odd" ';
- else:
- $class='class="even"';
- endif;
-?>
- <tr <?php echo $class?>>
- <td>
- <?php echo h($array[$i]['mp_lib'])?>
- </td>
- <td style="text-align:center">
- <?php echo h($array[$i]['jrn_def_name'])?>
-
- </td>
- <td style="text-align:center">
- <?php echo h($array[$i]['fd_label'])?>
-
- </td>
- <td style="text-align:center">
- <?php echo h($array[$i]['jrn_target'])?>
- </td>
- <td style="text-align:center">
- <?php echo h($array[$i]['vw_name'])?>
- </td>
-
-<?php
-echo
$td.HtmlInput::button_anchor(_('Modifie'),'?ac='.$_REQUEST['ac'].'&sa=mp&sb=change&'.dossier::get().
-
'&id='.$array[$i]['mp_id'],"","","smallbutton");
-?>
-
- </tr>
-<?php endfor;?>
-
-</table>
\ No newline at end of file
diff --git a/include/template/operation_detail_ach.php
b/include/template/operation_detail_ach.php
deleted file mode 100644
index bff3105c..00000000
--- a/include/template/operation_detail_ach.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/**
- * @file
- * @brief show detail of a operation of purchase
- *
- */
-global $g_parameter;
-?>
-<table class="result" >
- <?php
- bcscale(2);
- $total_htva = 0;
- $total_tvac = 0;
- echo th(_('Quick Code'));
- echo th(_('Description'));
- if ($g_parameter->MY_TVA_USE == 'Y')
- {
- echo th(_('Taux TVA'), 'style="text-align:right"');
- }
- else
- {
- echo th('');
- }
- echo th(_('Prix/Un.'), 'style="text-align:right"');
- echo th(_('Quantité'), 'style="text-align:right"');
- echo th(_('Personnel'), 'style="text-align:right"');
- echo th(_('Non ded'), 'style="text-align:right"');
-
- if ($g_parameter->MY_TVA_USE == 'Y')
- {
- echo th(_('HTVA'), 'style="text-align:right"');
- echo th(_('TVA NP'), 'style="text-align:right"');
- echo th(_('TVA'), 'style="text-align:right"');
- echo th(_('TVAC'), 'style="text-align:right"');
- }else
- echo th(_('Total'), 'style="text-align:right"');
-
- echo '</tr>';
- for ($e = 0; $e < count($obj->det->array); $e++)
- {
- $row = '';
- $q = $obj->det->array[$e];
- $fiche = new Fiche($cn, $q['qp_fiche']);
- $view_card_detail =
HtmlInput::card_detail($fiche->strAttribut(ATTR_DEF_QUICKCODE), "", '
class="line" ');
- $row = td($view_card_detail);
- $sym_tva = '';
-
- if ($g_parameter->MY_TVA_USE == 'Y' && $q['qp_vat_code'] != '')
- {
- /* retrieve TVA symbol */
- $tva = new Acc_Tva($cn, $q['qp_vat_code']);
- $tva->load();
- $sym_tva = h($tva->get_parameter('label'));
- }
- $input = new ISpan("e_march" . $q['j_id'] . "_label");
- $hidden = HtmlInput::hidden("j_id[]", $q['j_id']);
- $input->value = $fiche->strAttribut(ATTR_DEF_NAME);
- $row.=td($input->input() . $hidden);
- $row.=td($sym_tva, 'style="text-align:center"');
- $pu = 0;
- if ($q['qp_quantite'] != 0)
- $pu = bcdiv($q['qp_price'], $q['qp_quantite']);
- $row.=td(nbm($pu), 'class="num"');
- $row.=td(nbm($q['qp_quantite']), 'class="num"');
-
- $no_ded = $q['qp_nd_amount'];
- $row.=td(nbm($q['qp_dep_priv']), 'style="text-align:right"');
- $row.=td(nbm($no_ded), ' style="text-align:right"');
- $htva = $q['qp_price'];
-
-
- $row.=td(nbm($htva), 'class="num"');
- $tvac = bcadd($htva, $q['qp_vat']);
- $tvac = bcadd($tvac, $q['qp_nd_tva']);
- $tvac = bcadd($tvac, $q['qp_nd_tva_recup']);
-
-
- if ($g_parameter->MY_TVA_USE == 'Y')
- {
- $tva_amount = bcadd($q['qp_vat'], $q['qp_nd_tva']);
- $tva_amount = bcadd($tva_amount, $q['qp_nd_tva_recup']);
- $class = "";
- if ($q['qp_vat_sided'] <> 0)
- {
- $class = '
style="text-decoration:line-through"';
- $tvac = bcsub($tvac, $q['qp_vat_sided']);
- }
- $row.=td(nbm($q['qp_vat_sided']),'class="num"');
- $row.=td(nbm($tva_amount), 'class="num" ' . $class);
- $row.=td(nbm($tvac), 'class="num"');
- }
- $total_tvac+=$tvac;
- $total_htva+=$htva;
- echo tr($row);
- }
- if ($g_parameter->MY_TVA_USE == 'Y')
- $row = td(_('Total'), '
style="font-style:italic;text-align:right;font-weight: bolder;width:auto"
colspan="6"');
- else
- $row = td(_('Total'), '
style="font-style:italic;text-align:right;font-weight: bolder;width:auto"
colspan="6"');
- $row.=td(nbm($total_htva), 'class="num"
style="font-style:italic;font-weight: bolder;"');
- if ($g_parameter->MY_TVA_USE == 'Y')
- $row.=td("") . td(nbm($total_tvac), 'class="num"
style="font-style:italic;font-weight: bolder;"');
- echo tr($row);
- ?>
-</table>
diff --git a/include/template/operation_detail_fin.php
b/include/template/operation_detail_fin.php
deleted file mode 100644
index 93cd2250..00000000
--- a/include/template/operation_detail_fin.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/**
- * @file
- * @brief show detail of a operation of fin
- *
- */
-echo '<table class="result">';
-echo '<tr>';
-echo th(_('Compte en banque'));
-echo th(_('Tiers'));
-echo th(_('Libellé'));
-echo th(_('Montant'));
-echo '</tr>';
-
-echo '<tr>';
-$bk = new Fiche($cn, $obj->det->array[0]['qf_bank']);
-$view_card_detail = HtmlInput::card_detail($bk->get_quick_code(),
h($bk->getName()), ' class="line" ');
-echo td($view_card_detail);
-$other = new Fiche($cn, $obj->det->array[0]['qf_other']);
-$view_card_detail = HtmlInput::card_detail($other->get_quick_code(),
h($other->getName()), ' class="line" ');
-echo td($view_card_detail);
-$comment = strip_tags($obj->det->jr_comment);
-echo td($comment);
-echo td(nbm($obj->det->array[0]['qf_amount']), ' class="inum"');
-echo '</tr>';
-echo '</table>';
-?>
-
diff --git a/include/template/operation_detail_misc.php
b/include/template/operation_detail_misc.php
deleted file mode 100644
index 967d99d1..00000000
--- a/include/template/operation_detail_misc.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/**
- * @file
- * @brief how detail of a misc operation
- *
- */
-?>
-<table class="result">
-<tr>
-<?php
- echo th(_('Poste Comptable'));
- echo th(_('Quick Code'));
- echo th(_('Libellé'));
-echo th(_('Débit'), 'style="text-align:right"');
-echo th(_('Crédit'), 'style="text-align:right"');
-echo '</tr>';
-$amount_idx=0;
-for ($e = 0; $e < count($obj->det->array); $e++)
-{
- $row = '';
- $q = $obj->det->array;
- $view_history = HtmlInput::history_account($q[$e]['j_poste'],
$q[$e]['j_poste'], "", $exercice);
-
- $row.=td($view_history);
-
- if ($q[$e]['j_qcode'] != '')
- {
- $fiche = new Fiche($cn);
- $fiche->get_by_qcode($q[$e]['j_qcode']);
- $view_history=HtmlInput::history_card($fiche->id,
$q[$e]['j_qcode'], "", $exercice);
-
- }
- else
- $view_history = '';
- $row.=td($view_history);
- $l_lib = $q[$e]['j_text'];
-
- if ($l_lib != '')
- {
- $l_lib = $q[$e]['j_text'];
- }
- else if ($q[$e]['j_qcode'] != '')
- {
- // nom de la fiche
- $ff = new Fiche($cn);
- $ff->get_by_qcode($q[$e]['j_qcode']);
- $l_lib = $ff->strAttribut(ATTR_DEF_NAME);
- }
- else
- {
- // libellé du compte
- $name = $cn->get_value('select pcm_lib from tmp_pcmn where
pcm_val=$1', array($q[$e]['j_poste']));
- $l_lib = $name;
- }
- $l_lib = strip_tags($l_lib);
- $input = new ISpan("e_march" . $q[$e]['j_id'] . "_label");
- $input->value = $l_lib;
- $hidden = HtmlInput::hidden("j_id[]", $q[$e]['j_id']);
- $row.=td($input->input() . $hidden);
- $montant = td(nbm($q[$e]['j_montant']), 'class="num"');
- $row.=($q[$e]['j_debit'] == 't') ? $montant : td('');
- $row.=($q[$e]['j_debit'] == 'f') ? $montant : td('');
- echo tr($row);
-}
-?>
-</table>
\ No newline at end of file
diff --git a/include/template/operation_detail_ven.php
b/include/template/operation_detail_ven.php
deleted file mode 100644
index a56c0c63..00000000
--- a/include/template/operation_detail_ven.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/**
- * @file
- * @brief show detail of a operation of sale
- *
- */
-global $g_parameter;
-?>
-<table class="result">
-<?php
- bcscale(2);
- $total_htva=0;$total_tvac=0;
- echo th(_('Quick Code'));
-echo th(_('Description'));
-echo th(_('Prix/Un'), 'style="text-align:right"');
-echo th(_('Quantité'), 'style="text-align:right"');
-if ( $g_parameter->MY_TVA_USE == 'Y')
- echo th(_('Taux TVA'), 'style="text-align:right"');
-else
- echo th('');
-if ( $g_parameter->MY_TVA_USE == 'Y') {
- echo th(_('HTVA'), 'style="text-align:right"');
- echo th(_('TVA NP'), 'style="text-align:right"');
- echo th(_('TVA'), 'style="text-align:right"');
- echo th(_('TVAC'), 'style="text-align:right"');
-} else
- echo th(_('Total'), 'style="text-align:right"');
-
-
-echo '</tr>';
- for ($e=0;$e<count($obj->det->array);$e++) {
- $row='';
- $q=$obj->det->array[$e];
- $fiche=new Fiche($cn,$q['qs_fiche']);
-
$view_card_detail=HtmlInput::card_detail($fiche->strAttribut(ATTR_DEF_QUICKCODE),"",
' class="line" ');
- $row.=td($view_card_detail);
- $input = new ISpan("e_march" . $q['j_id'] . "_label");
- $hidden = HtmlInput::hidden("j_id[]", $q['j_id']);
- $input->value = $fiche->strAttribut(ATTR_DEF_NAME);
-
- $row.=td($input->input().$hidden);
- $sym_tva='';
- $pu=0;
- if ($q['qs_quantite'] != 0)
$pu=bcdiv($q['qs_price'],$q['qs_quantite']);
- $row.=td(nbm($pu),'class="num"');
- $row.=td(nbm($q['qs_quantite']),'class="num"');
- $sym_tva='';
- if ( $g_parameter->MY_TVA_USE=='Y' && $q['qs_vat_code'] != '') {
- /* retrieve TVA symbol */
- $tva=new Acc_Tva($cn,$q['qs_vat_code']);
- $tva->load();
- $sym_tva=(h($tva->get_parameter('label')));
- // $sym_tva=$sym
- }
-
- $row.=td($sym_tva,'style="text-align:center"');
-
- $htva=$q['qs_price'];
-
- $row.=td(nbm($htva),'class="num"');
- $tvac=bcadd($htva,$q['qs_vat']);
- if ($g_parameter->MY_TVA_USE=='Y')
- {
- $class="";
- if ($q['qs_vat_sided'] != 0) {
- $class=' style="text-decoration:line-through"';
- $tvac=bcsub($tvac,$q['qs_vat']);
- }
- $row.=td(nbm($q['qs_vat_sided']),'class="num"');
- $row.=td(nbm($q['qs_vat']),'class="num"'.$class);
- $row.=td(nbm($tvac),'class="num"');
- }
- $total_tvac=bcadd($total_tvac,$tvac);
- $total_htva=bcadd($total_htva,$htva);
- echo tr($row);
-
- }
- if ($g_parameter->MY_TVA_USE=='Y')
- $row= td(_('Total'),'
style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"');
- else
- $row= td(_('Total'),'
style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"');
-$row.=td(nbm($total_htva),'class="num" style="font-style:italic;font-weight:
bolder;"');
-if ($g_parameter->MY_TVA_USE=='Y')
- $row.=td("").td(nbm($total_tvac),'class="num"
style="font-style:italic;font-weight: bolder;"');
-echo tr($row);
-?>
-</table>
\ No newline at end of file
diff --git a/include/template/pcmn_update.php b/include/template/pcmn_update.php
deleted file mode 100644
index 3170f4d3..00000000
--- a/include/template/pcmn_update.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * This file is part of NOALYSS.
- *
- * NOALYSS isfree 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 isdistributed 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 (2014) Author Dany De Bontridder <dany@alchimerys.be>
-
-if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-
-/**
- * @file
- * @brief
- * @param type $name Descriptionara
- */
-echo HtmlInput::title_box(_("Poste comptable"), "acc_update", "hide");
-?>
-<span id="acc_update_info" class="notice"></span>
-<div class="content" style="margin:5px;padding: 5px" >
-<form method="post" id="acc_update_frm_id" onsubmit="pcmn_save();return
false;">
- <p style="text-align: left">
-<table >
-<?php
-$r= td(_('Poste
comptable'),'style="width:auto;width:9rem;text-align:right"').td($val->input());
-echo tr($r);
-$r=
td(_('Description'),'style="width:auto;text-align:right"').td($lib->input());
-echo tr($r);
-$r= td(_('Parent'),'style="width:auto;text-align:right"').td($parent->input());
-echo tr($r);
-$r= td(_('Type'),'style="width:auto;text-align:right"').td($type->input());
-echo tr($r);
-?>
-</table>
-<?php
-echo HtmlInput::hidden('p_oldu',$pcmn_val);
-echo HtmlInput::hidden('p_action',$action);
-echo dossier::hidden();
-$checkbox=new ICheckBox("delete_acc");
-echo _('Cocher pour effacer')." ".$checkbox->input();
-echo '<hr>';
-echo HtmlInput::submit('update',_('Sauve'));
-echo
HtmlInput::button('hide',_('Annuler'),'onClick="$(\'acc_update\').hide();return
true;"');
-?>
-</p>
-</form>
-</div>
\ No newline at end of file
diff --git a/include/template/print_ledger_simple.php
b/include/template/print_ledger_simple.php
deleted file mode 100644
index 5656c60b..00000000
--- a/include/template/print_ledger_simple.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-//This file is part of NOALYSS and is under GPL
-//see licence.txt
-?><TABLE class="result">
- <tr>
- <th><?php echo _("Pièce")?></th>
- <th><?php echo _("Date")?></th>
- <th><?php echo _("Paiement")?></th>
- <th><?php echo _("Ref")?></th>
- <th><?php echo _("Client")."/"._("Fournisseur")?></th>
- <th><?php echo _("Description")?></th>
- <th style="text-align:right">HTVA</th>
- <th style="text-align:right">Privé</th>
- <th style="text-align:right">DNA</th>
-
-
-<?php
-$col_tva="";
-
- if ( $own->MY_TVA_USE=='Y')
- {
- echo '<th style="text-align:right">TVA ND</th>';
- $a_Tva=$cn->get_array("select tva_id,tva_label from tva_rate where
tva_rate != 0.0000 order by tva_rate");
- foreach($a_Tva as $line_tva)
- {
- $col_tva.='<th style="text-align:right">Tva
'.$line_tva['tva_label'].'</th>';
- }
- }
-echo $col_tva;
-?>
- <th style="text-align:right">TVAC</th>
- <th><?php echo _("Opérations rapprochées")?></th>
- </tr>
-<?php
-$i = 0;
-$cn->prepare('reconcile_date','select * from jrn where jr_id in (select
jra_concerned from jrn_rapt where jr_id = $1 union all select jr_id from
jrn_rapt where jra_concerned=$1)');
-$tot['htva']=0;
-$tot['dep_priv']=0;
-$tot['dna']=0;
-$tot['tva_nd']=0;
-$tot['tvac']=0;
-$tot['tva']=array();
-bcscale(4);
-foreach ($Row as $line) {
- $i++;
- /*
- * Get date of reconcile operation
- */
- $ret_reconcile=$cn->execute('reconcile_date',array($line['jr_id']));
- $class = ($i % 2 == 0) ? ' class="even" ' : ' class="odd" ';
- echo "<tr $class>";
-
- // Receipt number
- echo "<TD>" . h($line['jr_pj_number']) . "</TD>";
-
- // Date
- echo "<TD>" . smaller_date($line['date']) . "</TD>";
- echo "<TD>" . smaller_date($line['date_paid']) . "</TD>";
-
- // Internal with detail
- echo "<TD>" . HtmlInput::detail_op($line['jr_id'], $line['jr_internal']) .
"</TD>";
-
- // find the tiers (normally in $Row !
- $tiers = $Jrn->get_tiers($line['jrn_def_type'], $line['jr_id']);
- echo td($tiers);
-
- // Label
- echo "<TD>" . h($line['comment']) . "</TD>";
-
- // Private expense
- $dep_priv=($line['dep_priv']==0)?"":nbm(round($line['dep_priv'],2),2);
- $tot['dep_priv']=bcadd($tot['dep_priv'], floatval($line['dep_priv']));
-
- // No deductible
- $dna=($line['dna']==0)?"":nbm(round($line['dna'],2),2);
- $tot['dna']=bcadd($tot['dna'],round(floatval($line['dna'])),2);
-
- // HTVA amount
- echo "<TD class=\"num\">" . nbm(round($line['HTVA'],2),2) . "</TD>";
- $tot['htva']=bcadd($tot['htva'], round(floatval($line['HTVA']),2));
-
- echo "<TD class=\"num\">" .$dep_priv . "</TD>";
- echo "<TD class=\"num\">" . $dna . "</TD>";
-
-
//--------------------------------------------------------------------------
- // If VAT then display it
-
//--------------------------------------------------------------------------
- if ($own->MY_TVA_USE == 'Y' )
- {
- $tva_dna=($line['tva_dna']==0)?"":nbm(round($line['tva_dna']),2);
- $tot['tva_nd']=bcadd($tot['tva_nd'],
round(floatval($line['tva_dna']),2));
- echo "<TD class=\"num\">" . $tva_dna. "</TD>";
- $a_tva_amount=array();
-
- foreach ($line['TVA'] as $lineTVA)
- {
- foreach ($a_Tva as $idx=>$line_tva)
- {
-
- if ($line_tva['tva_id'] == $lineTVA[1][0])
- {
- $a=$line_tva['tva_id'];
- $a_tva_amount[$a]=$lineTVA[1][2];
- }
- }
- }
- foreach ($a_Tva as $line_tva)
- {
- $a=$line_tva['tva_id'];
- if ( isset($a_tva_amount[$a]) && $a_tva_amount[$a] != 0) {
- echo '<td class="num">'.nb(round($a_tva_amount[$a],2)).'</td>';
-
$tot['tva'][$a]=(isset($tot['tva'][$a]))?bcadd($tot['tva'][$a],round(floatval($a_tva_amount[$a]),2)):round(floatval($a_tva_amount[$a]),2);
- }
- else
- printf("<td class=\"num\"></td>");
- }
- }
-
- echo '<td class="num">'.round($line['TVAC'],2).'</td>';
- $tot['tvac']=bcadd($tot['tvac'], round(floatval($line['TVAC']),2));
- /*
- * If reconcile print them
- */
- echo '<td>';
- $max=Database::num_row($ret_reconcile);
- if ($max > 0) {
- $sep="";
- for ($e=0;$e<$max;$e++) {
- $row=Database::fetch_array($ret_reconcile, $e);
- echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '.
$row['jr_internal']);
- $sep=' ,';
- }
- }
- echo '</td>';
- echo "</tr>";
-}
-/**
- * summary
- */
-?>
- <tr class="highlight">
- <td>
- <?php echo _('Totaux')?>
- </td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td class="num"><?php echo nbm($tot['htva']); ?></td>
- <td class="num"><?php echo nbm($tot['dep_priv']) ?></td>
- <td class="num"><?php echo nbm($tot['dna'])?></td>
- <?php if ($own->MY_TVA_USE == 'Y' ): ?>
- <td><?php echo nbm($tot['tva_nd']) ?></td>
- <?php foreach ($a_Tva as $line_tva) :
- $a=$line_tva['tva_id'];
- if ( isset($tot['tva'][$a])) :
- ?>
- <td class="num"><?php echo nbm($tot['tva'][$a])?></td>
- <?php else : ?>
- <td>
-
- </td>
- <?php endif; ?>
- <?php endforeach;?>
- <?php endif; ?>
- <td class="num"><?php echo nbm($tot['tvac'])?></td>
- <td></td>
- </tr>
-
-
-</table>
\ No newline at end of file
diff --git a/include/template/profile_menu.php
b/include/template/profile_menu.php
deleted file mode 100644
index 60c27245..00000000
--- a/include/template/profile_menu.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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
- */
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder danydb@aevalys.eu
-
-/**
- * @file
- * @brief show all the menu and submenu of this profile
- *
- */
-
-?>
diff --git a/include/template/tag_choose.php b/include/template/tag_choose.php
deleted file mode 100644
index 0581d290..00000000
--- a/include/template/tag_choose.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-//This file is part of NOALYSS and is under GPL
-//see licence.txt
-?><?php
-echo HtmlInput::title_box(_('Etiquette'), 'tag_div');
-$max=$this->cn->count($ret);
-if ( $max == 0 ) {
- echo h2(_("Aucune étiquette disponible"),' class="notice"');
- return;
-}
-?>
-<table>
- <tr>
- <th>
- Tag
- </th>
- <th>
- Description
- </th>
- </tr>
-<?php
-$gDossier=Dossier::id();
-if (isNumber($_REQUEST['ag_id']) == 0 ) die ('ERROR : parameters invalid');
- for ($i=0;$i<$max;$i++):
- $row=Database::fetch_array($ret, $i);
-?>
- <tr class="<?php echo (($i%2==0)?'even':'odd');?>">
- <td>
- <?php
-
$js=sprintf("action_tag_add('%s','%s','%s')",$gDossier,$_REQUEST['ag_id'],$row['t_id']);
- echo HtmlInput::anchor($row['t_tag'], "", "onclick=\"$js\"");
- ?>
- </td>
- <td>
- <?php
- echo $row['t_description'];
- ?>
- </td>
- </tr>
-<?php
- endfor;
- ?>
-</table>
-<?php
-
$js=sprintf("onclick=\"show_tag('%s','%s','%s','j')\"",Dossier::id(),"none",'-1');
- echo HtmlInput::button("tag_add", "Ajout d'une étiquette", $js);
-?>
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Noalyss-commit] [noalyss] branch devel updated: Task #2134 : code cleaning , removed unused files,
Dany De Bontridder <=