Clean files

dev/resources/iso-normes/sample_FEC_file.txt

@@ -1,4 +1,4 @@
-JOURNALCODE	JOURNALLIB	ECRITURENUM	ECRITUREDATE	COMPTENUM	COMPTELIB	COMPAUXNUM	COMPAUXLIB	PIECEREF	PIECEDATE	ECRITURELIB	DEBIT	CREDIT	ECRITURELET	DATELET	VALIDDATE	MONTANTDEVISE	IDEVISE
+JOURNALCODE	JOURNALLIB	ECRITURENUM	ECRITUREDATE	COMPTENUM	COMPTELIB	COMPAUXNUM	COMPAUXLIB	PIECEREF	PIECEDATE	ECRITURELIB	DEBIT	CREDIT	ECRITURELET	DATELET	VALIDDATE	MONTANTDEVISE	IDEVISE
 Banque	Banque	17293	20170109	401PPRO	PUBLI-PROV			L08	20170109	PPRO domiciliation 1TR	       187,20	         0,00			20170109		
 Banque	Banque	17293	20170109	5121CRA	CR AGRICOLE			L08	20170109	PPRO domiciliation 1TR	         0,00	       187,20			20170109		
 Banque	Banque	17295	20170109	401ORPA	ORANGE PARIS			Report	20170109	ORPA adsl par 12	        96,00	         0,00			20170109		

dev/tools/rmphpclosingtag.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-# vim:ft=sh:ts=3:sts=3:sw=3:et:
- 
-###
-# Strips the closing php tag `?>` and any following blank lines from the 
-# end of any PHP file in the current working directory and sub-directories. Files
-# with non-whitespace characters following the closing tag will not be affected.
-#
-# Author: Bryan C. Geraghty <bryan@ravensight.org>
-# Date: 2009-10-28
-# Source: http://bryan.ravensight.org/2010/07/remove-php-closing-tag/
-##
- 
-FILES=$(pcregrep -rnM --include='^.*\.php$' '^\?\>(?=([\s\n]+)?$(?!\n))' .);
- 
-for MATCH in $FILES;
-do
-   FILE=`echo $MATCH | awk -F ':' '{print $1}'`;
-   TARGET=`echo $MATCH | awk -F ':' '{print $2}'`;
-   LINE_COUNT=`wc -l $FILE | awk -F " " '{print $1}'`;
-   echo "Removing lines ${TARGET} through ${LINE_COUNT} from file $FILE...";
-   sed -i "${TARGET},${LINE_COUNT}d" $FILE;
-done;

htdocs/accountancy/bookkeeping/thirdparty_lettrage.php

@@ -34,12 +34,24 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 
-$page = GETPOST ( "page" );
+$action=GETPOST('action','aZ09');
-$sortorder = GETPOST ( "sortorder" );
+$massaction=GETPOST('massaction','alpha');
-$search_year = GETPOST ( "search_year" );
+$show_files=GETPOST('show_files','int');
-$sortfield = GETPOST ( "sortfield" );
+$confirm=GETPOST('confirm','alpha');
-$action = GETPOST ( 'action', 'alpha' );
+$toselect = GETPOST('toselect', 'array');
 
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "bk.rowid";
+
+$search_year = GETPOST ( "search_year" );
 
 // Security check
 $socid = GETPOST("socid",'int');
@@ -48,20 +60,17 @@ $socid = GETPOST("socid",'int');
 $object = new Societe($db);
 $object->id = $socid;
 $object->fetch($socid);
+
+
 $form = new Form($db);
-
 $BookKeeping = new lettering($db);
-
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "bk.rowid";
-
-$offset = $conf->liste_limit * $page;
-
 $formaccounting = new FormAccounting($db);
 
+
 /*
  * Action
  */
+
 if ($action == 'lettering') {
 
 	$result =  $BookKeeping->updatelettrage($_POST['ids']);

htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php

@@ -36,11 +36,24 @@ require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 
 
-$page = GETPOST ( "page" );
+$action=GETPOST('action','aZ09');
-$sortorder = GETPOST ( "sortorder" );
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
+$toselect = GETPOST('toselect', 'array');
+
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "bk.rowid";
+
 $search_year = GETPOST ( "search_year" );
-$sortfield = GETPOST ( "sortfield" );
-$action = GETPOST ( 'action', 'alpha' );
 
 
 // Security check
@@ -50,17 +63,12 @@ $socid = GETPOST("socid",'int');
 $object = new Societe($db);
 $object->id = $socid;
 $object->fetch($socid);
+
 $form = new Form($db);
-
 $BookKeeping = new lettering($db);
-
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "bk.rowid";
-
-$offset = $conf->liste_limit * $page;
-
 $formaccounting = new FormAccounting($db);
 
+
 /*
  * Action
  */