svn+ssh://danydb@svn/svn/phpcompta/tags/rel650 ........ r5056 | danydb | 2012-06-30 14:39:28 +0200 (Sat, 30 Jun 2012) | 2 lines 0000666: Limiter dans le tableau accueil, le calendrier à exercice courant 0000667: DASHBOAD : agrandir les éléments ........ r5058 | danydb | 2012-06-30 18:43:34 +0200 (Sat, 30 Jun 2012) | 6 lines ------------------------------------------------------------------------ r5057 | danydb | 2012-06-30 18:40:12 +0200 (Sat, 30 Jun 2012) | 1 line bug follow_up::get_late ------------------------------------------------------------------------ ........ r5059 | danydb | 2012-06-30 18:57:18 +0200 (Sat, 30 Jun 2012) | 1 line bug follow_up::get_late ........ r5060 | danydb | 2012-06-30 18:58:55 +0200 (Sat, 30 Jun 2012) | 1 line bug follow_up::get_late ........ r5061 | danydb | 2012-06-30 19:03:29 +0200 (Sat, 30 Jun 2012) | 1 line bug follow_up::get_late ........ r5062 | danydb | 2012-06-30 19:36:51 +0200 (Sat, 30 Jun 2012) | 1 line bug follow_up::get_late ........ r5063 | danydb | 2012-07-01 17:42:31 +0200 (Sun, 01 Jul 2012) | 1 line correct check_formula ........ r5064 | danydb | 2012-07-03 00:56:38 +0200 (Tue, 03 Jul 2012) | 1 line Due to rewrite of parse formula, formula are not evaluated properly ........ r5065 | danydb | 2012-07-08 20:58:45 +0200 (Sun, 08 Jul 2012) | 1 line Bug cannot create a new profile due a javascript error ........ r5066 | danydb | 2012-07-09 18:43:20 +0200 (Mon, 09 Jul 2012) | 1 line 0000674: Deux actions-gestion ne peuvent avoir le même numéro de pièce ........ r5067 | danydb | 2012-07-10 12:34:55 +0200 (Tue, 10 Jul 2012) | 1 line duplicate Ref ........ r5068 | danydb | 2012-07-15 11:14:27 +0200 (Sun, 15 Jul 2012) | 2 lines New function : select exercice with end & start date ........ r5069 | danydb | 2012-07-15 11:15:05 +0200 (Sun, 15 Jul 2012) | 2 lines Javascript var ask_global to reload window if it is <> 0 ........ r5070 | danydb | 2012-07-16 01:10:32 +0200 (Mon, 16 Jul 2012) | 1 line Fix bug in tool_uos ........ r5071 | danydb | 2012-07-19 02:22:15 +0200 (Thu, 19 Jul 2012) | 1 line Improve printing of action - gestion ........ r5072 | danydb | 2012-07-19 12:50:48 +0200 (Thu, 19 Jul 2012) | 2 lines 0000672: Amélioration apparence ........ r5073 | danydb | 2012-07-19 12:51:27 +0200 (Thu, 19 Jul 2012) | 2 lines Enlève background blanc pour les notices ........ r5074 | danydb | 2012-07-19 13:49:10 +0200 (Thu, 19 Jul 2012) | 1 line Improve printing of action - gestion ........ r5075 | danydb | 2012-07-19 16:31:11 +0200 (Thu, 19 Jul 2012) | 1 line Add script for Javascript sort of table ........ r5076 | danydb | 2012-07-19 17:52:24 +0200 (Thu, 19 Jul 2012) | 1 line Add script for Javascript sort of table ........ r5077 | danydb | 2012-07-19 18:13:18 +0200 (Thu, 19 Jul 2012) | 1 line Add script for Javascript sort of table for reconciliation bank ........ r5078 | danydb | 2012-07-20 14:55:50 +0200 (Fri, 20 Jul 2012) | 1 line Show default sorted column ........ r5079 | danydb | 2012-07-20 14:57:16 +0200 (Fri, 20 Jul 2012) | 1 line add documentation ........ r5080 | danydb | 2012-07-26 17:31:54 +0200 (Thu, 26 Jul 2012) | 1 line Add ID ........ r5081 | danydb | 2012-07-29 13:56:59 +0200 (Sun, 29 Jul 2012) | 4 lines add new function default_value_get default_value_post default_value_request ........ r5082 | danydb | 2012-07-29 14:14:51 +0200 (Sun, 29 Jul 2012) | 1 line improve documentation ........ r5083 | danydb | 2012-07-29 14:50:29 +0200 (Sun, 29 Jul 2012) | 1 line Add constant for year ........ r5084 | danydb | 2012-07-29 15:08:11 +0200 (Sun, 29 Jul 2012) | 1 line Message for exercice ........ r5085 | danydb | 2012-07-29 15:08:56 +0200 (Sun, 29 Jul 2012) | 1 line New constant for date range ........ r5086 | danydb | 2012-07-30 20:13:30 +0200 (Mon, 30 Jul 2012) | 1 line cosmetic ........ r5087 | danydb | 2012-07-30 20:38:17 +0200 (Mon, 30 Jul 2012) | 1 line cosmetic ........ r5088 | danydb | 2012-07-30 21:28:46 +0200 (Mon, 30 Jul 2012) | 1 line define max_card_search ........ r5089 | danydb | 2012-07-30 21:36:55 +0200 (Mon, 30 Jul 2012) | 1 line 0000695: ajout d'un bouton pour chercher une fiche ........ r5090 | danydb | 2012-07-30 21:42:06 +0200 (Mon, 30 Jul 2012) | 1 line Amélioration recherche ........ r5091 | danydb | 2012-07-30 21:44:23 +0200 (Mon, 30 Jul 2012) | 1 line Amélioration recherche ........ r5092 | danydb | 2012-08-23 20:29:52 +0200 (Thu, 23 Aug 2012) | 1 line add a field hidden ........ r5093 | danydb | 2012-08-23 22:52:06 +0200 (Thu, 23 Aug 2012) | 2 lines 0000705: Perte info lettrage lors de l'export .csv Nom de fichier comprennent la date et le poste comptable ........ r5094 | danydb | 2012-08-23 23:00:58 +0200 (Thu, 23 Aug 2012) | 1 line 0000700: CARD : historique, Dans le PDF, il manque le quick code et dans le CSV, il manque le nom ........ r5095 | danydb | 2012-08-23 23:06:00 +0200 (Thu, 23 Aug 2012) | 1 line recherche aussi sur quick-code ........ r5096 | danydb | 2012-08-23 23:20:32 +0200 (Thu, 23 Aug 2012) | 1 line #699 CARD : liste des fiches ........ r5097 | danydb | 2012-08-24 22:27:20 +0200 (Fri, 24 Aug 2012) | 1 line replace ob_clean by ob_end_clean ........ r5098 | danydb | 2012-09-04 19:55:56 +0200 (Tue, 04 Sep 2012) | 1 line ajout ag_ref dans action aujourd'hui et action en retard ........ r5099 | danydb | 2012-09-06 18:47:29 +0200 (Thu, 06 Sep 2012) | 1 line 0000721: Nouveaux tag pour les stocks dans génération de documents ........ r5100 | danydb | 2012-09-12 23:05:12 +0200 (Wed, 12 Sep 2012) | 1 line fix bug : when a value is empty then value is n ull ........ r5101 | danydb | 2012-09-15 00:30:02 +0200 (Sat, 15 Sep 2012) | 1 line fix : missing closing tag </a> ........ r5102 | danydb | 2012-09-15 15:22:08 +0200 (Sat, 15 Sep 2012) | 1 line Show type of menu ........ r5103 | danydb | 2012-09-15 17:39:55 +0200 (Sat, 15 Sep 2012) | 1 line Improve add menu printing ........ r5104 | danydb | 2012-09-15 17:48:42 +0200 (Sat, 15 Sep 2012) | 1 line Improve the profile configuration ........ r5105 | danydb | 2012-09-16 03:01:44 +0200 (Sun, 16 Sep 2012) | 1 line Improve the style sheet with hx.title ........ r5106 | danydb | 2012-09-16 18:40:59 +0200 (Sun, 16 Sep 2012) | 1 line bug : Impossible d'avoir impression GRAND LIVRE Pour compte non soldé ........ r5107 | danydb | 2012-09-16 18:53:59 +0200 (Sun, 16 Sep 2012) | 1 line Améliore apparence calculatrice ........ r5108 | danydb | 2012-09-17 20:28:04 +0200 (Mon, 17 Sep 2012) | 1 line When adding a menu it cannot depend on itself ........ r5109 | danydb | 2012-09-17 20:29:23 +0200 (Mon, 17 Sep 2012) | 1 line When adding a menu it cannot depend on itself (update) ........ r5110 | danydb | 2012-09-17 20:46:17 +0200 (Mon, 17 Sep 2012) | 1 line Show default menu ........ r5111 | danydb | 2012-09-17 20:55:13 +0200 (Mon, 17 Sep 2012) | 1 line bug : show default module ........ r5112 | danydb | 2012-09-17 20:57:00 +0200 (Mon, 17 Sep 2012) | 1 line bug : show default module, otherwise menu ........ r5113 | danydb | 2012-09-17 21:07:25 +0200 (Mon, 17 Sep 2012) | 1 line Default module otherwise try to find default menu if several results then returns the first one ........ r5114 | danydb | 2012-09-17 21:13:43 +0200 (Mon, 17 Sep 2012) | 1 line Fix bug when clicking several times on search_poste ........ r5115 | danydb | 2012-09-18 23:37:02 +0200 (Tue, 18 Sep 2012) | 1 line problème quand utilisateur est administrateur global, impossible de voir les postes comptables ........ r5116 | danydb | 2012-09-18 23:46:37 +0200 (Tue, 18 Sep 2012) | 1 line Improve the style sheet with hx.title ........ r5117 | danydb | 2012-09-18 23:47:27 +0200 (Tue, 18 Sep 2012) | 1 line improve html widget with un ID ........ r5118 | danydb | 2012-09-19 22:55:43 +0200 (Wed, 19 Sep 2012) | 1 line Bug locale must be in uppercase ........ r5119 | danydb | 2012-09-29 23:28:46 +0200 (Sat, 29 Sep 2012) | 1 line add the javascript function check_date and check_date_id ........ r5120 | danydb | 2012-09-30 00:04:17 +0200 (Sun, 30 Sep 2012) | 1 line correct javascript function check_date_id ........ r5121 | danydb | 2012-10-01 19:57:15 +0200 (Mon, 01 Oct 2012) | 1 line 0000736: Totaux dans écran ........ r5122 | danydb | 2012-10-01 20:47:26 +0200 (Mon, 01 Oct 2012) | 1 line 0000733: Impression opération depuis POP ME OUT ........ r5123 | danydb | 2012-10-01 20:47:56 +0200 (Mon, 01 Oct 2012) | 1 line Bug : id inconnu dans irelated_action ........ r5124 | danydb | 2012-10-01 20:56:07 +0200 (Mon, 01 Oct 2012) | 1 line 0000733: Impression opération depuis POP ME OUT ........ r5125 | danydb | 2012-10-01 20:58:53 +0200 (Mon, 01 Oct 2012) | 1 line bug css for select ........ r5126 | danydb | 2012-10-01 21:07:00 +0200 (Mon, 01 Oct 2012) | 1 line 0000732: Pouvoir imprimer les opérations avant confirmation ........ r5127 | danydb | 2012-10-01 21:16:04 +0200 (Mon, 01 Oct 2012) | 1 line bug financier le nom de la banque n'est pas mis à jour ........ r5128 | danydb | 2012-10-01 21:23:16 +0200 (Mon, 01 Oct 2012) | 1 line CSS cosmetic nom de journal en h2.title ........ r5129 | danydb | 2012-10-01 21:30:20 +0200 (Mon, 01 Oct 2012) | 1 line Grand Livre : surligné ligne paire ........ r5130 | danydb | 2012-10-01 22:03:42 +0200 (Mon, 01 Oct 2012) | 1 line CSS présentation, remplace fieldset ........ r5131 | danydb | 2012-10-01 22:04:03 +0200 (Mon, 01 Oct 2012) | 1 line Ne surligne pas les actions cloturées ........ r5132 | danydb | 2012-10-01 22:04:19 +0200 (Mon, 01 Oct 2012) | 1 line Les readonly sont en bleus ........ r5133 | danydb | 2012-10-01 22:16:55 +0200 (Mon, 01 Oct 2012) | 1 line Bug in the search button if id was not set ........ r5134 | danydb | 2012-10-02 18:49:40 +0200 (Tue, 02 Oct 2012) | 1 line underline properly ........ r5135 | danydb | 2012-10-02 18:58:09 +0200 (Tue, 02 Oct 2012) | 3 lines Fix several some bugs : * PRINTJRN column name for ledget ACH, simple without VAT * PRINTPOSTE show everything even when unlettered is choosen ........ r5136 | danydb | 2012-10-02 18:58:34 +0200 (Tue, 02 Oct 2012) | 1 line Improve documentation ........ r5137 | danydb | 2012-10-02 23:01:27 +0200 (Tue, 02 Oct 2012) | 1 line Fix problem with date suggest ........ r5138 | danydb | 2012-10-03 11:27:52 +0200 (Wed, 03 Oct 2012) | 1 line Bug auto compute for action ........ r5139 | danydb | 2012-10-16 00:58:52 +0200 (Tue, 16 Oct 2012) | 1 line Suggérer la date = oui ne met plus la date à jour dans les achats ........ r5140 | danydb | 2012-10-16 01:13:30 +0200 (Tue, 16 Oct 2012) | 1 line Suggérer la date = oui ne met plus la date à jour dans les achats ........ r5141 | danydb | 2012-10-16 01:14:01 +0200 (Tue, 16 Oct 2012) | 1 line Suggérer la date = oui ne met plus la date à jour dans les achats ........ r5142 | danydb | 2012-10-17 17:54:22 +0200 (Wed, 17 Oct 2012) | 1 line 0000749: poste alphanumérique (fournisseur 44xxx) ........ r5143 | danydb | 2012-10-20 19:13:04 +0200 (Sat, 20 Oct 2012) | 2 lines #754 Les totaux dans Prévisions #753 Les totaux dans FOURNISSEUR, CLIENT et ADMINISTRATION incorrectes ........ r5144 | danydb | 2012-10-30 20:41:29 +0100 (Tue, 30 Oct 2012) | 1 line #372 système de nouvelles ........ r5145 | danydb | 2012-10-30 20:42:45 +0100 (Tue, 30 Oct 2012) | 1 line add id to submit button ........ r5146 | danydb | 2012-10-30 20:43:04 +0100 (Tue, 30 Oct 2012) | 1 line add a label to ibutton ........ r5147 | danydb | 2012-10-30 20:43:43 +0100 (Tue, 30 Oct 2012) | 1 line add niceEdit.js ........ r5148 | danydb | 2012-10-30 20:44:20 +0100 (Tue, 30 Oct 2012) | 1 line get_folder_access must also test global admin ........ r5149 | danydb | 2012-10-30 22:14:26 +0100 (Tue, 30 Oct 2012) | 1 line 0000755: Erreur en création de fiche avec un compte (455) déjà utilisé. ........ r5150 | danydb | 2012-10-30 22:20:07 +0100 (Tue, 30 Oct 2012) | 2 lines 0000744: (classe) 5Actif 0000746: ajouter un espace là où il faut ........ r5151 | danydb | 2012-10-30 22:25:19 +0100 (Tue, 30 Oct 2012) | 1 line 0000743: le pointeur se trouve sur 'effacer' ........ r5152 | danydb | 2012-11-11 20:47:20 +0100 (Sun, 11 Nov 2012) | 1 line 0000756: Achat ou vente pour rembourser de la TVA, marchandise ou quant. = 0 ........ r5153 | danydb | 2012-11-11 20:51:40 +0100 (Sun, 11 Nov 2012) | 1 line 0000750: place de nouvelle fiche et effacer ........ r5154 | danydb | 2012-11-11 20:55:08 +0100 (Sun, 11 Nov 2012) | 1 line 0000742: remplacer le mot 'classe ' par le mot ' poste (comptable)' ........ r5155 | danydb | 2012-11-22 21:50:27 +0100 (Thu, 22 Nov 2012) | 1 line fix problem with french accounting ........ r5156 | danydb | 2012-11-29 23:17:33 +0100 (Thu, 29 Nov 2012) | 1 line #738: Attribut en pourcent doit être compris entre 0 et 100 au lieu de 0 et 1 ........ r5157 | danydb | 2012-12-05 21:08:07 +0100 (Wed, 05 Dec 2012) | 2 lines 0000766: Utilisation des moyens de paiements : libellé différent pour l'opération de paiement et d'achat/vente. 0000765: affichage des colonnes Prix HTVA quand la société n'est pas assujettie à la TVA ........ r5158 | danydb | 2012-12-06 21:42:51 +0100 (Thu, 06 Dec 2012) | 1 line 0000762: TVA intracommunautaire ........ r5159 | danydb | 2012-12-06 21:43:22 +0100 (Thu, 06 Dec 2012) | 1 line Bug : the history doesn't show the first_name for VEN ........ r5160 | danydb | 2012-12-06 21:51:09 +0100 (Thu, 06 Dec 2012) | 1 line 0000762: TVA intracommunautaire typo ........ r5161 | danydb | 2012-12-06 22:56:36 +0100 (Thu, 06 Dec 2012) | 1 line 0000762: TVA intracommunautaire : montant facture au lieu montant opération ........ r5162 | danydb | 2012-12-06 23:09:20 +0100 (Thu, 06 Dec 2012) | 1 line 0000745: en bas de page il apparaît un pop up ........ r5163 | danydb | 2012-12-08 19:10:52 +0100 (Sat, 08 Dec 2012) | 1 line patch version 104 ........ r5164 | danydb | 2012-12-08 20:48:57 +0100 (Sat, 08 Dec 2012) | 1 line patch version 104 ........ r5165 | danydb | 2012-12-08 21:12:14 +0100 (Sat, 08 Dec 2012) | 1 line cosmetique ........ r5166 | danydb | 2012-12-08 21:30:44 +0100 (Sat, 08 Dec 2012) | 1 line rewriting ........ r5167 | danydb | 2012-12-08 23:48:30 +0100 (Sat, 08 Dec 2012) | 1 line Ajout IMPJRN, détail opération ........ r5168 | danydb | 2012-12-14 19:35:46 +0100 (Fri, 14 Dec 2012) | 1 line add personal expense ........ r5169 | danydb | 2012-12-14 19:58:23 +0100 (Fri, 14 Dec 2012) | 1 line remove "choississez votre exercice" ........ r5170 | danydb | 2013-01-03 21:15:40 +0100 (Thu, 03 Jan 2013) | 1 line 0000773: Bug sur fiches avec double postes comptables ........ r5171 | danydb | 2013-01-19 00:28:52 +0100 (Sat, 19 Jan 2013) | 1 line 0000778: Si dossier n'existe pas alors il y a une erreur dans administration > dossier ........ r5172 | danydb | 2013-01-20 15:57:40 +0100 (Sun, 20 Jan 2013) | 1 line 0000778: Si dossier n'existe pas alors il y a une erreur dans administration > dossier ........ r5173 | danydb | 2013-01-23 22:38:28 +0100 (Wed, 23 Jan 2013) | 2 lines #780 & #776 forbids some character in the quickcode ........ r5174 | danydb | 2013-01-23 22:58:53 +0100 (Wed, 23 Jan 2013) | 1 line Improve format_name ........ r5175 | danydb | 2013-01-23 22:59:52 +0100 (Wed, 23 Jan 2013) | 1 line #778 skip the unexisting folder ........ r5176 | danydb | 2013-02-06 19:34:25 +0100 (Wed, 06 Feb 2013) | 1 line 0000783: Apparence dans HISTO des notes ........ r5177 | danydb | 2013-02-06 19:53:39 +0100 (Wed, 06 Feb 2013) | 1 line 0000783: Apparence dans HISTO des notes ........ r5178 | danydb | 2013-02-13 18:05:32 +0100 (Wed, 13 Feb 2013) | 1 line 0000788: Lettrage : date invalide, bloque ........ r5179 | danydb | 2013-02-13 18:15:46 +0100 (Wed, 13 Feb 2013) | 1 line 0000788: Lettrage : date invalide, bloque ........ r5180 | danydb | 2013-02-13 18:25:43 +0100 (Wed, 13 Feb 2013) | 1 line 0000787: Rapprochement bancaire ........ r5181 | danydb | 2013-02-13 19:13:10 +0100 (Wed, 13 Feb 2013) | 1 line Erreur si db inexistante alors echec ........ r5182 | danydb | 2013-02-28 14:04:44 +0100 (Thu, 28 Feb 2013) | 1 line small bugs in javascript : typo ........ r5183 | danydb | 2013-03-05 15:40:08 +0100 (Tue, 05 Mar 2013) | 2 lines 0000791: Afficher dans la vue Paramètres / Divers / TVA le code TVA ........ r5184 | danydb | 2013-03-13 16:23:22 +0100 (Wed, 13 Mar 2013) | 2 lines 0000795: Orthographe : dans le calendrier : tâche suivi ........ r5185 | danydb | 2013-03-13 16:30:37 +0100 (Wed, 13 Mar 2013) | 2 lines 0000796: Lettrage : en code Hexadécimal ou en base 36 (A à Z + 0 à 10) ........ r5186 | danydb | 2013-03-13 22:10:15 +0100 (Wed, 13 Mar 2013) | 2 lines 0000796: Lettrage : en code Hexadécimal ou en base 36 (A à Z + 0 à 10) ........ r5187 | danydb | 2013-03-14 00:04:53 +0100 (Thu, 14 Mar 2013) | 2 lines esthétique ........ r5188 | danydb | 2013-03-17 01:24:05 +0100 (Sun, 17 Mar 2013) | 3 lines 0000797: Amélioration du workflow : statut des documents / actions ........ r5189 | danydb | 2013-03-20 13:57:01 +0100 (Wed, 20 Mar 2013) | 1 line code cleaning : remove function Acc_Payment::row ........ r5190 | danydb | 2013-03-20 14:02:36 +0100 (Wed, 20 Mar 2013) | 1 line Code cleaning ........ r5191 | danydb | 2013-03-25 23:42:49 +0100 (Mon, 25 Mar 2013) | 1 line Documentation : doxygen tag misplaced due to netbeans ........ r5192 | danydb | 2013-03-27 19:54:37 +0100 (Wed, 27 Mar 2013) | 1 line cosmetic : width div for operation detail ........ r5193 | danydb | 2013-03-27 20:08:09 +0100 (Wed, 27 Mar 2013) | 1 line cosmetic : orthographe profile -> profil ........ r5194 | danydb | 2013-03-27 20:17:51 +0100 (Wed, 27 Mar 2013) | 1 line cosmetic : ajout bouton fermeture si détail non disponible ........ r5195 | danydb | 2013-03-27 20:20:33 +0100 (Wed, 27 Mar 2013) | 1 line 0000802: Bug : visibilité des actions ........ r5196 | danydb | 2013-03-27 20:22:53 +0100 (Wed, 27 Mar 2013) | 1 line 0000802: Bug : visibilité des actions ........ r5197 | danydb | 2013-03-27 23:25:34 +0100 (Wed, 27 Mar 2013) | 1 line 0000801: Ajouter un lien vers l'action ........ r5198 | danydb | 2013-03-27 23:26:17 +0100 (Wed, 27 Mar 2013) | 1 line typo profile -> profil ........ r5199 | danydb | 2013-03-28 00:12:02 +0100 (Thu, 28 Mar 2013) | 1 line javascript bug ........ r5200 | danydb | 2013-03-28 00:12:25 +0100 (Thu, 28 Mar 2013) | 1 line bug last_operation <> late_operation ........ r5201 | danydb | 2013-03-28 00:14:27 +0100 (Thu, 28 Mar 2013) | 1 line cosmetic ........ r5202 | danydb | 2013-03-28 18:05:08 +0100 (Thu, 28 Mar 2013) | 1 line Add patch upgrade105 ........ r5203 | danydb | 2013-03-28 18:13:22 +0100 (Thu, 28 Mar 2013) | 1 line 0000799: Pouvoir augmenter le nombre de lignes proposées pour un rapprochement ........ r5204 | danydb | 2013-03-28 18:54:15 +0100 (Thu, 28 Mar 2013) | 1 line voir les heures dans commentaire ........ r5205 | danydb | 2013-03-28 22:58:34 +0100 (Thu, 28 Mar 2013) | 1 line Cannot save a detail operation ........ r5206 | danydb | 2013-03-28 23:23:50 +0100 (Thu, 28 Mar 2013) | 1 line Cannot save financial ........ r5209 | danydb | 2013-04-04 20:53:49 +0200 (Thu, 04 Apr 2013) | 1 line 0000807: Legend n'est pas agrandi ........ r5210 | danydb | 2013-04-14 23:46:39 +0200 (Sun, 14 Apr 2013) | 1 line 0000819: Note de débit et de crédit négative avec TVA autoliquidation ........ r5211 | danydb | 2013-04-15 18:57:05 +0200 (Mon, 15 Apr 2013) | 1 line Impossible de sauver dans journaux financiers dans certains cas ........ r5212 | danydb | 2013-04-15 19:56:50 +0200 (Mon, 15 Apr 2013) | 1 line 0000819: Note de débit et de crédit négative avec TVA autoliquidation ........ r5213 | danydb | 2013-04-24 23:28:32 +0200 (Wed, 24 Apr 2013) | 1 line 0000824: Impossible de rechercher une action pour les actions liées ........ r5214 | danydb | 2013-05-02 22:54:28 +0200 (Thu, 02 May 2013) | 1 line improve doc ........ r5215 | danydb | 2013-05-03 23:56:40 +0200 (Fri, 03 May 2013) | 3 lines #0000822: Génération document : changer le type de cellule Attention problème si on a utiliser = devant le tag pour forcer le type numérique ........
1123 lines
33 KiB
PHP
1123 lines
33 KiB
PHP
<?php
|
|
|
|
/*
|
|
* This file is part of PhpCompta.
|
|
*
|
|
* PhpCompta 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.
|
|
*
|
|
* PhpCompta 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 PhpCompta; 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 ddebontridder@yahoo.fr
|
|
|
|
/**\file
|
|
* \brief the class Acc_Ledger_Fin inherits from Acc_Ledger, this
|
|
* object permit to manage the financial ledger
|
|
*/
|
|
require_once("class_idate.php");
|
|
require_once("class_icard.php");
|
|
require_once("class_ispan.php");
|
|
require_once("class_itext.php");
|
|
require_once("class_iconcerned.php");
|
|
require_once("class_ifile.php");
|
|
require_once("class_ihidden.php");
|
|
require_once("class_iselect.php");
|
|
require_once('class_acc_ledger.php');
|
|
require_once('ac_common.php');
|
|
require_once('class_acc_reconciliation.php');
|
|
|
|
class Acc_Ledger_Fin extends Acc_Ledger
|
|
{
|
|
|
|
function __construct($p_cn, $p_init)
|
|
{
|
|
parent::__construct($p_cn, $p_init);
|
|
$this->type = 'FIN';
|
|
}
|
|
|
|
/**\brief verify that the data are correct before inserting or confirming
|
|
* \param an array (usually $_POST)
|
|
* \return String
|
|
* \throw Exception on error occurs
|
|
*/
|
|
|
|
public function verify($p_array)
|
|
{
|
|
global $g_user;
|
|
extract($p_array);
|
|
/* check for a double reload */
|
|
if (isset($mt) && $this->db->count_sql('select jr_mt from jrn where jr_mt=$1', array($mt)) != 0)
|
|
throw new Exception(_('Double Encodage'), 5);
|
|
|
|
/* check if we can write into this ledger */
|
|
if ($g_user->check_jrn($p_jrn) != 'W')
|
|
throw new Exception(_('Accès interdit'), 20);
|
|
|
|
/* check if there is a bank account linked to the ledger */
|
|
$bank_id = $this->get_bank();
|
|
|
|
if ($this->db->count() == 0)
|
|
throw new Exception("Ce journal n'a pas de compte en banque, allez dans paramètre->journal pour régler cela");
|
|
/* check if the accounting of the bank is correct */
|
|
$fBank = new Fiche($this->db, $bank_id);
|
|
$bank_accounting = $fBank->strAttribut(ATTR_DEF_ACCOUNT);
|
|
if (trim($bank_accounting) == '')
|
|
throw new Exception('Le poste comptable du compte en banque de ce journal est invalide');
|
|
|
|
/* check if the account exists */
|
|
$poste = new Acc_Account_Ledger($this->db, $bank_accounting);
|
|
if ($poste->load() == false)
|
|
throw new Exception('Le poste comptable du compte en banque de ce journal est invalide');
|
|
if ($chdate != 1 && $chdate != 2) throw new Exception ('Le choix de date est invalide');
|
|
if ( $chdate == 1 )
|
|
{
|
|
/* check if the date is valid */
|
|
if (isDate($e_date) == null)
|
|
{
|
|
throw new Exception('Date invalide', 2);
|
|
}
|
|
$oPeriode = new Periode($this->db);
|
|
if ($this->check_periode() == false)
|
|
{
|
|
$periode = $oPeriode->find_periode($e_date);
|
|
}
|
|
else
|
|
{
|
|
$oPeriode->p_id = $periode;
|
|
list ($min, $max) = $oPeriode->get_date_limit();
|
|
if (cmpDate($e_date, $min) < 0 ||
|
|
cmpDate($e_date, $max) > 0)
|
|
throw new Exception(_('Date et periode ne correspondent pas'), 6);
|
|
}
|
|
|
|
/* check if the periode is closed */
|
|
if ($this->is_closed($periode) == 1)
|
|
{
|
|
throw new Exception(_('Periode fermee'), 6);
|
|
}
|
|
|
|
/* check if we are using the strict mode */
|
|
if ($this->check_strict() == true)
|
|
{
|
|
/* if we use the strict mode, we get the date of the last
|
|
operation */
|
|
$last_date = $this->get_last_date();
|
|
if ($last_date != null && cmpDate($e_date, $last_date) < 0)
|
|
throw new Exception(_('Vous utilisez le mode strict la dernière operation est à la date du ')
|
|
. $last_date . _(' vous ne pouvez pas encoder à une date antérieure'), 15);
|
|
}
|
|
}
|
|
|
|
$acc_pay = new Acc_Operation($this->db);
|
|
|
|
$nb = 0;
|
|
$tot_amount = 0;
|
|
//----------------------------------------
|
|
// foreach item
|
|
//----------------------------------------
|
|
for ($i = 0; $i < $nb_item; $i++)
|
|
{
|
|
if (strlen(trim(${'e_other' . $i})) == 0)
|
|
continue;
|
|
/* check if amount are numeric and */
|
|
if (isNumber(${'e_other' . $i . '_amount'}) == 0)
|
|
throw new Exception('La fiche ' . ${'e_other' . $i} . 'a un montant invalide [' . ${'e_other' . $i . '_amount'} . ']', 6);
|
|
|
|
/* compute the total */
|
|
$tot_amount+=round(${'e_other' . $i . '_amount'}, 2);
|
|
/* check if all card has a ATTR_DEF_ACCOUNT */
|
|
$fiche = new Fiche($this->db);
|
|
$fiche->get_by_qcode(${'e_other' . $i});
|
|
if ($fiche->empty_attribute(ATTR_DEF_ACCOUNT) == true)
|
|
throw new Exception('La fiche ' . ${'e_other' . $i} . 'n\'a pas de poste comptable', 8);
|
|
|
|
$sposte = $fiche->strAttribut(ATTR_DEF_ACCOUNT);
|
|
// if 2 accounts, take only the debit one for customer
|
|
if (strpos($sposte, ',') != 0)
|
|
{
|
|
$array = explode(',', $sposte);
|
|
$poste_val = $array[1];
|
|
}
|
|
else
|
|
{
|
|
$poste_val = $sposte;
|
|
}
|
|
/* The account exists */
|
|
$poste = new Acc_Account_Ledger($this->db, $poste_val);
|
|
if ($poste->load() == false)
|
|
{
|
|
throw new Exception('Pour la fiche ' . ${'e_other' . $i} . ' le poste comptable [' . $poste->id . 'n\'existe pas', 9);
|
|
}
|
|
/* Check if the card belong to the ledger */
|
|
$fiche = new Fiche($this->db);
|
|
$fiche->get_by_qcode(${'e_other' . $i});
|
|
if ($fiche->belong_ledger($p_jrn, 'deb') != 1)
|
|
throw new Exception('La fiche ' . ${'e_other' . $i} . 'n\'est pas accessible à ce journal', 10);
|
|
if ($chdate == 2)
|
|
{
|
|
{/* check if the date is valid */
|
|
if (isDate(${'dateop' . $i}) == null)
|
|
{
|
|
throw new Exception('Date invalide', 2);
|
|
}
|
|
$oPeriode = new Periode($this->db);
|
|
if ($this->check_periode() == false)
|
|
{
|
|
$periode = $oPeriode->find_periode(${'dateop' . $i});
|
|
}
|
|
else
|
|
{
|
|
$oPeriode->p_id = $periode;
|
|
list ($min, $max) = $oPeriode->get_date_limit();
|
|
if (cmpDate(${'dateop' . $i}, $min) < 0 ||
|
|
cmpDate(${'dateop' . $i}, $max) > 0)
|
|
throw new Exception(_('Date et periode ne correspondent pas'), 6);
|
|
}
|
|
|
|
/* check if the periode is closed */
|
|
if ($this->is_closed($periode) == 1)
|
|
{
|
|
throw new Exception(_('Periode fermee'), 6);
|
|
}
|
|
|
|
/* check if we are using the strict mode */
|
|
if ($this->check_strict() == true)
|
|
{
|
|
/* if we use the strict mode, we get the date of the last
|
|
operation */
|
|
$last_date = $this->get_last_date();
|
|
if ($last_date != null && cmpDate(${'dateop' . $i}, $last_date) < 0)
|
|
throw new Exception(_('Vous utilisez le mode strict la dernière operation est à la date du ')
|
|
. $last_date . _(' vous ne pouvez pas encoder à une date antérieure'), 15);
|
|
}
|
|
}
|
|
}
|
|
$nb++;
|
|
}
|
|
if ($nb == 0)
|
|
throw new Exception('Il n\'y a aucune opération', 12);
|
|
|
|
/* Check if the last_saldo and first_saldo are correct */
|
|
if (strlen(trim($last_sold)) != 0 && isNumber($last_sold) &&
|
|
strlen(trim($first_sold)) != 0 && isNumber($first_sold))
|
|
{
|
|
$diff = $last_sold - $first_sold;
|
|
$diff = round($diff, 2) - round($tot_amount, 2);
|
|
if ($first_sold != 0 && $last_sold != 0)
|
|
{
|
|
if ($diff != 0)
|
|
throw new Exception('Le montant de l\'extrait est incorrect' .
|
|
$tot_amount . ' extrait ' . $diff, 13);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**\brief
|
|
* \param $p_array contains the value usually it is $_POST
|
|
* \return string with html code
|
|
* \note the form tag are not set here
|
|
*/
|
|
|
|
function input($p_array = null, $notused = 0)
|
|
{
|
|
global $g_parameter, $g_user;
|
|
if ($p_array != null)
|
|
extract($p_array);
|
|
|
|
$pview_only = false;
|
|
|
|
$f_add_button = new IButton('add_card');
|
|
$f_add_button->label = _('Créer une nouvelle fiche');
|
|
$f_add_button->set_attribute('ipopup', 'ipop_newcard');
|
|
$f_add_button->set_attribute('jrn', $this->id);
|
|
$f_add_button->javascript = " this.jrn=\$('p_jrn').value;select_card_type(this);";
|
|
$str_add_button = ($g_user->check_action(FICADD) == 1) ? $f_add_button->input() : "";
|
|
|
|
// The first day of the periode
|
|
$pPeriode = new Periode($this->db);
|
|
list ($l_date_start, $l_date_end) = $pPeriode->get_date_limit($g_user->get_periode());
|
|
if ($g_parameter->MY_DATE_SUGGEST == 'Y')
|
|
$op_date = (!isset($e_date) ) ? $l_date_start : $e_date;
|
|
else
|
|
$op_date = (!isset($e_date) ) ? '' : $e_date;
|
|
|
|
$r = "";
|
|
|
|
$r.=dossier::hidden();
|
|
$f_legend = 'Banque, caisse';
|
|
// Date
|
|
//--
|
|
$Date = new IDate("e_date", $op_date);
|
|
$Date->setReadOnly($pview_only);
|
|
$f_date = $Date->input();
|
|
$f_period = '';
|
|
if ($this->check_periode() == true)
|
|
{
|
|
// Periode
|
|
//--
|
|
$l_user_per = (isset($periode)) ? $periode : $g_user->get_periode();
|
|
$period = new IPeriod();
|
|
$period->cn = $this->db;
|
|
$period->type = OPEN;
|
|
$period->value = $l_user_per;
|
|
$period->user = $g_user;
|
|
$period->name = 'periode';
|
|
try
|
|
{
|
|
$l_form_per = $period->input();
|
|
}
|
|
catch (Exception $e)
|
|
{
|
|
if ($e->getCode() == 1)
|
|
{
|
|
echo "Aucune période ouverte";
|
|
exit();
|
|
}
|
|
}
|
|
$label = HtmlInput::infobulle(3);
|
|
$f_period = "Période comptable $label" . $l_form_per;
|
|
}
|
|
|
|
// Ledger (p_jrn)
|
|
//--
|
|
$onchange="update_bank();ajax_saldo('first_sold');update_name();";
|
|
|
|
if ($g_parameter->MY_DATE_SUGGEST == 'Y')
|
|
$onchange .= 'get_last_date();';
|
|
if ($g_parameter->MY_PJ_SUGGEST=='Y')
|
|
$onchange .= 'update_pj();';
|
|
|
|
$add_js = 'onchange="'.$onchange.'"';
|
|
$wLedger = $this->select_ledger('FIN', 2);
|
|
if ($wLedger == null)
|
|
exit('Pas de journal disponible');
|
|
|
|
$wLedger->javascript = $add_js;
|
|
|
|
$label = " Journal " . HtmlInput::infobulle(2);
|
|
$f_jrn = $label . $wLedger->input();
|
|
|
|
|
|
// retrieve bank name, code and account from the jrn_def.jrn_def_bank
|
|
|
|
$f_bank = '<span id="bkname">' . $this->get_bank_name() . '</span>';
|
|
if ($this->bank_id == "")
|
|
{
|
|
echo h2("Journal de banque non configuré " . $this->get_name(), ' class="error"');
|
|
echo '<span class="error"> vous devez donner à ce journal un compte en banque (fiche), modifiez dans CFGLED</span>';
|
|
alert("Journal de banque non configuré " . $this->get_name());
|
|
}
|
|
|
|
$f_legend_detail = 'Opérations financières';
|
|
//--------------------------------------------------
|
|
// Saldo begin end
|
|
//-------------------------------------------------
|
|
// Extrait
|
|
$default_pj = '';
|
|
if ($g_parameter->MY_PJ_SUGGEST == 'Y')
|
|
{
|
|
$default_pj = $this->guess_pj();
|
|
}
|
|
$wPJ = new IText('e_pj');
|
|
$wPJ->readonly = false;
|
|
$wPJ->size = 10;
|
|
$wPJ->value = (isset($e_pj)) ? $e_pj : $default_pj;
|
|
|
|
$f_extrait = $wPJ->input() . HtmlInput::hidden('e_pj_suggest', $default_pj);
|
|
$label = HtmlInput::infobulle(7);
|
|
|
|
$first_sold = (isset($first_sold)) ? $first_sold : "";
|
|
$wFirst = new INum('first_sold', $first_sold);
|
|
|
|
$last_sold = isset($last_sold) ? $last_sold : "";
|
|
$wLast = new INum('last_sold', $last_sold);
|
|
|
|
|
|
$max = (isset($nb_item)) ? $nb_item : MAX_ARTICLE;
|
|
|
|
$r.= HtmlInput::hidden('nb_item', $max);
|
|
//--------------------------------------------------
|
|
// financial operation
|
|
//-------------------------------------------------
|
|
|
|
$array = array();
|
|
// Parse each " tiers"
|
|
for ($i = 0; $i < $max; $i++)
|
|
{
|
|
$tiers = (isset(${"e_other" . $i})) ? ${"e_other" . $i} : "";
|
|
|
|
$tiers_amount = (isset(${"e_other$i" . "_amount"})) ? round(${"e_other$i" . "_amount"}, 2) : 0;
|
|
|
|
$tiers_comment = (isset(${"e_other$i" . "_comment"})) ? ${"e_other$i" . "_comment"} : "";
|
|
|
|
$operation_date=new IDate("dateop".$i);
|
|
$operation_date->value=(isset(${'dateop'.$i}))?${'dateop'.$i}:"";
|
|
$array[$i]['dateop']=$operation_date->input();
|
|
${"e_other$i" . "_amount"} = (isset(${"e_other$i" . "_amount"})) ? ${"e_other$i" . "_amount"} : 0;
|
|
|
|
$W1 = new ICard();
|
|
$W1->label = "";
|
|
$W1->name = "e_other" . $i;
|
|
$W1->id = "e_other" . $i;
|
|
$W1->value = $tiers;
|
|
$W1->extra = 'deb'; // credits
|
|
$W1->typecard = 'deb';
|
|
$W1->set_dblclick("fill_ipopcard(this);");
|
|
$W1->set_attribute('ipopup', 'ipopcard');
|
|
|
|
// name of the field to update with the name of the card
|
|
$W1->set_attribute('label', 'e_other_name' . $i);
|
|
// name of the field to update with the name of the card
|
|
$W1->set_attribute('typecard', 'filter');
|
|
// Add the callback function to filter the card on the jrn
|
|
$W1->set_callback('filter_card');
|
|
$W1->set_function('fill_data');
|
|
$W1->javascript = sprintf(' onchange="fill_data_onchange(\'%s\');" ', $W1->name);
|
|
$W1->readonly = $pview_only;
|
|
$array[$i]['qcode'] = $W1->input();
|
|
$array[$i]['search'] = $W1->search();
|
|
|
|
// Card name
|
|
//
|
|
$card_name = "";
|
|
if ($tiers != "")
|
|
{
|
|
$fiche = new Fiche($this->db);
|
|
$fiche->get_by_qcode($tiers);
|
|
$card_name = $this->db->get_value("Select ad_value from fiche_detail where ad_id=$1 and f_id=$2", array(ATTR_DEF_NAME, $fiche->id));
|
|
}
|
|
|
|
$wcard_name = new IText("e_other_name" . $i, $card_name);
|
|
$wcard_name->id=$wcard_name->name;
|
|
$wcard_name->readOnly = true;
|
|
$array[$i]['cname'] = $wcard_name->input();
|
|
|
|
// Comment
|
|
$wComment = new IText("e_other$i" . "_comment", $tiers_comment);
|
|
|
|
$wComment->size = 35;
|
|
$wComment->setReadOnly($pview_only);
|
|
$array[$i]['comment'] = $wComment->input();
|
|
// amount
|
|
$wAmount = new INum("e_other$i" . "_amount", $tiers_amount);
|
|
|
|
$wAmount->size = 7;
|
|
$wAmount->setReadOnly($pview_only);
|
|
$array[$i]['amount'] = $wAmount->input();
|
|
// concerned
|
|
${"e_concerned" . $i} = (isset(${"e_concerned" . $i})) ? ${"e_concerned" . $i} : ""
|
|
;
|
|
$wConcerned = new IConcerned("e_concerned" . $i, ${"e_concerned" . $i});
|
|
$wConcerned->setReadOnly($pview_only);
|
|
$wConcerned->amount_id = "e_other" . $i . "_amount";
|
|
|
|
$wConcerned->paid = 'paid';
|
|
$array[$i]['concerned'] = $wConcerned->input();
|
|
}
|
|
|
|
ob_start();
|
|
require_once('template/form_ledger_fin.php');
|
|
$r.=ob_get_contents();
|
|
ob_end_clean();
|
|
|
|
|
|
return $r;
|
|
}
|
|
|
|
/**\brief show the summary before inserting into the database, it
|
|
* calls the function for adding a attachment. The function verify
|
|
* should be called before
|
|
* \param $p_array an array usually is $_POST
|
|
* \return string with code html
|
|
*/
|
|
|
|
public function confirm($p_array, $p_nothing = 0)
|
|
{
|
|
global $g_parameter,$g_user;
|
|
$r = "";
|
|
bcscale(2);
|
|
extract($p_array);
|
|
$pPeriode = new Periode($this->db);
|
|
if ($this->check_periode() == true)
|
|
{
|
|
$pPeriode->p_id = $periode;
|
|
}
|
|
else
|
|
{
|
|
if (isDate($e_date) != null) {
|
|
$pPeriode->find_periode($e_date);
|
|
} else {
|
|
$pPeriode->p_id=$g_user->get_periode();
|
|
}
|
|
}
|
|
|
|
list ($l_date_start, $l_date_end) = $pPeriode->get_date_limit();
|
|
$exercice = $pPeriode->get_exercice();
|
|
$r.='';
|
|
$r.='<fieldset><legend>Banque, caisse </legend>';
|
|
$r.= '<div id="jrn_name_div">';
|
|
$r.='<h2 class="title" id="jrn_name" style="display:inline">' . $this->get_name() . '</h2>';
|
|
$r.= '</div>';
|
|
$r.='<TABLE width="100%">';
|
|
// Date
|
|
//--
|
|
$r.="<tr>";
|
|
if ( $chdate == 1 ) $r.='<td> Date : </td><td>' . $e_date;
|
|
// Periode
|
|
//--
|
|
$r.="<td>";
|
|
$r.="Période comptable </td><td>";
|
|
$r.=$l_date_start . ' - ' . $l_date_end;
|
|
$r.="</td>";
|
|
$r.="</tr>";
|
|
// Ledger (p_jrn)
|
|
//--
|
|
$r.='<tr>';
|
|
$r.='<td> Journal </td>';
|
|
$this->id = $p_jrn;
|
|
$r.='<td>';
|
|
$r.=h($this->get_name());
|
|
$r.='</td>';
|
|
$r.='</tr>';
|
|
|
|
//retrieve bank name
|
|
$bk_id = $this->get_bank();
|
|
|
|
$fBank = new Fiche($this->db, $bk_id);
|
|
$e_bank_account_label = $this->get_bank_name();
|
|
|
|
$filter_year = " j_tech_per in (select p_id from parm_periode where p_exercice='" . $exercice . "')";
|
|
|
|
$acc_account = new Acc_Account_Ledger($this->db, $fBank->strAttribut(ATTR_DEF_ACCOUNT));
|
|
$solde = $acc_account->get_solde($filter_year);
|
|
$new_solde = $solde;
|
|
|
|
$r.="<TR><td colspan=\"4\"> Banque ";
|
|
$r.=$e_bank_account_label;
|
|
|
|
$r.="</TABLE>";
|
|
|
|
$r.='</fieldset>';
|
|
|
|
$r.='<div class="myfieldset"><h1 class="legend">Extrait de compte</h1>';
|
|
//--------------------------------------------------
|
|
// Saldo begin end
|
|
//-------------------------------------------------
|
|
$r.='<table>';
|
|
$r.='<tr>';
|
|
// Extrait
|
|
//--
|
|
$r.=tr('<td> Numéro d\'extrait</td>' . td(h($e_pj)));
|
|
$r.='<tr><td >Solde début extrait </td>';
|
|
$r.='<td style="num">' . nbm($first_sold) . '</td></tr>';
|
|
$r.='<tr><td>Solde fin extrait </td>';
|
|
$r.='<td style="num">' . nbm($last_sold) . '</td></tr>';
|
|
$r.='</table>';
|
|
|
|
$r.='<h1 class="legend">Opérations financières</h1>';
|
|
//--------------------------------------------------
|
|
// financial operation
|
|
//-------------------------------------------------
|
|
$r.='<TABLE style="width:100%" id="fin_item">';
|
|
$r.="<TR>";
|
|
if ($chdate==2) $r.='<th>Date</th>';
|
|
$r.="<th style=\"width:auto;text-align:left\" colspan=\"2\">Nom</TH>";
|
|
$r.="<th style=\"text-align:left\" >Commentaire</TH>";
|
|
$r.="<th style=\"text-align:right\">Montant</TH>";
|
|
$r.='<th colspan="2"> Op. Concernée(s)</th>';
|
|
|
|
/* if we use the AC */
|
|
if ($g_parameter->MY_ANALYTIC != 'nu')
|
|
{
|
|
$anc = new Anc_Plan($this->db);
|
|
$a_anc = $anc->get_list();
|
|
$x = count($a_anc);
|
|
/* set the width of the col */
|
|
$r.='<th colspan="' . $x . '">' . _('Compt. Analytique') . '</th>';
|
|
|
|
/* add hidden variables pa[] to hold the value of pa_id */
|
|
$r.=Anc_Plan::hidden($a_anc);
|
|
}
|
|
$r.="</TR>";
|
|
// Parse each " tiers"
|
|
$tot_amount = 0;
|
|
//--------------------------------------------------
|
|
// For each items
|
|
//--------------------------------------------------
|
|
for ($i = 0; $i < $nb_item; $i++)
|
|
{
|
|
|
|
$tiers = (isset(${"e_other" . $i})) ? ${"e_other" . $i} : ""
|
|
;
|
|
|
|
if (strlen(trim($tiers)) == 0)
|
|
continue;
|
|
$tiers_label = "";
|
|
$tiers_amount = round(${"e_other$i" . "_amount"}, 2);
|
|
$tot_amount = bcadd($tot_amount, $tiers_amount);
|
|
$tiers_comment = h(${"e_other$i" . "_comment"});
|
|
// If $tiers has a value
|
|
$fTiers = new Fiche($this->db);
|
|
$fTiers->get_by_qcode($tiers);
|
|
|
|
$tiers_label = $fTiers->strAttribut(ATTR_DEF_NAME);
|
|
|
|
$r.="<TR>";
|
|
if ($chdate==2) $r.=td(${"dateop".$i});
|
|
$r.="<td>" . ${'e_other' . $i} . "</TD>";
|
|
// label
|
|
$r.='<TD style="width:25%;border-bottom:1px dotted grey;">';
|
|
$r.=$fTiers->strAttribut(ATTR_DEF_NAME);
|
|
$r.='</td>';
|
|
// Comment
|
|
$r.='<td style="width:40%">' . $tiers_comment . '</td>';
|
|
// amount
|
|
$r.='<td class="num">' . nbm($tiers_amount) . '</td>';
|
|
// concerned
|
|
$r.='<td style="text-align:center">';
|
|
if (${"e_concerned" . $i} != '')
|
|
{
|
|
$jr_internal = $this->db->get_array("select jr_internal from jrn where jr_id in (" . ${"e_concerned" . $i} . ")");
|
|
$comma="";
|
|
for ($x = 0; $x < count($jr_internal); $x++)
|
|
{
|
|
$r.=$comma.HtmlInput::detail_op(${"e_concerned" . $i}, $jr_internal[$x]['jr_internal']);
|
|
$comma=" , ";
|
|
}
|
|
}
|
|
$r.='</td>';
|
|
// encode the pa
|
|
if ($g_parameter->MY_ANALYTIC != 'nu' && preg_match("/^[6,7]/", $fTiers->strAttribut(ATTR_DEF_ACCOUNT)) == 1) // use of AA
|
|
{
|
|
// show form
|
|
$anc_op = new Anc_Operation($this->db);
|
|
$null = ($g_parameter->MY_ANALYTIC == 'op') ? 1 : 0;
|
|
$r.='<td>';
|
|
$p_mode = 1;
|
|
$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);
|
|
$r.=$anc_op->display_form_plan($p_array, $null, $p_mode, $i, $tiers_amount);
|
|
$r.='</td>';
|
|
}
|
|
|
|
$r.='</TR>';
|
|
}
|
|
$r.="</TABLE>";
|
|
|
|
// saldo
|
|
$r.='<br>Ancien solde = ' . $solde;
|
|
$new_solde+=$tot_amount;
|
|
$r.='<br>Nouveau solde = ' . $new_solde;
|
|
$r.='<br>Difference =' . $tot_amount;
|
|
// check for upload piece
|
|
$file = new IFile();
|
|
|
|
$r.="<br>Ajoutez une pièce justificative ";
|
|
$r.=$file->input("pj", "");
|
|
|
|
$r.='</div>';
|
|
//--------------------------------------------------
|
|
// Hidden variables
|
|
//--------------------------------------------------
|
|
$r.=dossier::hidden();
|
|
$r.=HtmlInput::hidden('p_jrn', $this->id);
|
|
$r.=HtmlInput::hidden('nb_item', $nb_item);
|
|
$r.=HtmlInput::hidden('last_sold', $last_sold);
|
|
$r.=HtmlInput::hidden('first_sold', $first_sold);
|
|
$r.=HtmlInput::hidden('e_pj', $e_pj);
|
|
$r.=HtmlInput::hidden('e_pj_suggest', $e_pj_suggest);
|
|
$r.=HtmlInput::hidden('e_date', $e_date);
|
|
$mt = microtime(true);
|
|
$r.=HtmlInput::hidden('mt', $mt);
|
|
|
|
if (isset($periode))
|
|
$r.=HtmlInput::hidden('periode', $periode);
|
|
$r.=dossier::hidden();
|
|
$r.=HtmlInput::hidden('sa', 'n','chdate');
|
|
for ($i = 0; $i < $nb_item; $i++)
|
|
{
|
|
$tiers = (isset(${"e_other" . $i})) ? ${"e_other" . $i} : "" ;
|
|
$r.=HtmlInput::hidden('e_other' . $i, $tiers);
|
|
$r.=HtmlInput::hidden('e_other' . $i, $tiers);
|
|
$r.=HtmlInput::hidden('e_other' . $i . '_comment', ${'e_other' . $i . '_comment'});
|
|
$r.=HtmlInput::hidden('e_other' . $i . '_amount', ${'e_other' . $i . '_amount'});
|
|
$r.=HtmlInput::hidden('e_concerned' . $i, ${'e_concerned' . $i});
|
|
$r.=HtmlInput::hidden('dateop' . $i, ${'dateop' . $i});
|
|
$r.=HtmlInput::hidden('chdate' , $chdate);
|
|
}
|
|
|
|
return $r;
|
|
}
|
|
|
|
/**\brief save the data into the database, included the attachment,
|
|
* and the reconciliations
|
|
* \param $p_array usually $_POST
|
|
* \return string with HTML code
|
|
*/
|
|
|
|
public function insert($p_array = null)
|
|
{
|
|
global $g_parameter;
|
|
bcscale(2);
|
|
$internal_code = "";
|
|
$oid = 0;
|
|
extract($p_array);
|
|
$ret = '';
|
|
// Debit = banque
|
|
$bank_id = $this->get_bank();
|
|
$fBank = new Fiche($this->db, $bank_id);
|
|
$e_bank_account = $fBank->strAttribut(ATTR_DEF_QUICKCODE);
|
|
// Get the saldo
|
|
$pPeriode = new Periode($this->db);
|
|
$sposte = $fBank->strAttribut(ATTR_DEF_ACCOUNT);
|
|
// if 2 accounts, take only the debit one for customer
|
|
if (strpos($sposte, ',') != 0)
|
|
{
|
|
$array = explode(',', $sposte);
|
|
$poste_val = $array[0];
|
|
}
|
|
else
|
|
{
|
|
$poste_val = $sposte;
|
|
}
|
|
|
|
$acc_account = new Acc_Account_Ledger($this->db, $poste_val);
|
|
|
|
// If date = deposit date
|
|
if ($chdate == 1 )
|
|
{
|
|
if ($this->check_periode() == true)
|
|
{
|
|
$pPeriode->p_id = $periode;
|
|
}
|
|
else
|
|
{
|
|
$pPeriode->find_periode($e_date);
|
|
}
|
|
$exercice = $pPeriode->get_exercice();
|
|
$filter_year = " j_tech_per in (select p_id from parm_periode where p_exercice='" . $exercice . "')";
|
|
$solde = $acc_account->get_solde($filter_year);
|
|
$new_solde = $solde;
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
try
|
|
{
|
|
$this->db->start();
|
|
$amount = 0.0;
|
|
$idx_operation = 0;
|
|
$ret = '<table class="result" style="width:75%">';
|
|
$ret.=tr(th('Date').th('n° interne') . th('Quick Code') . th('Nom') . th('Libellé') . th('Montant', ' style="text-align:right"'));
|
|
// Credit = goods
|
|
$get_solde=true;
|
|
for ($i = 0; $i < $nb_item; $i++)
|
|
{
|
|
// insert it into the database
|
|
// and quit the loop ?
|
|
if (strlen(trim(${"e_other$i"})) == 0)
|
|
continue;
|
|
|
|
if ( $chdate == 2 ) $e_date=${'dateop'.$i};
|
|
// if date is date of operation
|
|
if ($chdate == 2 && $get_solde )
|
|
{
|
|
$get_solde=false;
|
|
if ($this->check_periode() == true)
|
|
{
|
|
$pPeriode->p_id = $periode;
|
|
}
|
|
else
|
|
{
|
|
$pPeriode->find_periode($e_date);
|
|
}
|
|
$exercice = $pPeriode->get_exercice();
|
|
$filter_year = " j_tech_per in (select p_id from parm_periode where p_exercice='" . $exercice . "')";
|
|
$solde = $acc_account->get_solde($filter_year);
|
|
$new_solde = $solde;
|
|
}
|
|
$fPoste = new Fiche($this->db);
|
|
$fPoste->get_by_qcode(${"e_other$i"});
|
|
|
|
// round it
|
|
${"e_other$i" . "_amount"} = round(${"e_other$i" . "_amount"}, 2);
|
|
|
|
|
|
|
|
$amount+=${"e_other$i" . "_amount"};
|
|
// Record a line for the bank
|
|
// Compute the j_grpt
|
|
$seq = $this->db->get_next_seq('s_grpt');
|
|
|
|
$acc_operation = new Acc_Operation($this->db);
|
|
$acc_operation->date = $e_date;
|
|
$sposte = $fPoste->strAttribut(ATTR_DEF_ACCOUNT);
|
|
// if 2 accounts
|
|
if (strpos($sposte, ',') != 0)
|
|
{
|
|
$array = explode(',', $sposte);
|
|
if (${"e_other$i" . "_amount"} < 0)
|
|
$poste_val = $array[1];
|
|
else
|
|
$poste_val = $array[0];
|
|
}
|
|
else
|
|
{
|
|
$poste_val = $sposte;
|
|
}
|
|
|
|
|
|
$acc_operation->poste = $poste_val;
|
|
$acc_operation->amount = ${"e_other$i" . "_amount"} * (-1);
|
|
$acc_operation->grpt = $seq;
|
|
$acc_operation->jrn = $p_jrn;
|
|
$acc_operation->type = 'd';
|
|
|
|
if (isset($periode))
|
|
$tperiode = $periode;
|
|
else
|
|
{
|
|
$per = new Periode($this->db);
|
|
$tperiode = $per->find_periode($e_date);
|
|
}
|
|
$acc_operation->periode = $tperiode;
|
|
$acc_operation->qcode = ${"e_other" . $i};
|
|
$j_id = $acc_operation->insert_jrnx();
|
|
|
|
$acc_operation = new Acc_Operation($this->db);
|
|
$acc_operation->date = $e_date;
|
|
$sposte = $fBank->strAttribut(ATTR_DEF_ACCOUNT);
|
|
|
|
// if 2 accounts
|
|
if (strpos($sposte, ',') != 0)
|
|
{
|
|
$array = explode(',', $sposte);
|
|
if (${"e_other$i" . "_amount"} < 0)
|
|
$poste_val = $array[1];
|
|
else
|
|
$poste_val = $array[0];
|
|
}
|
|
else
|
|
{
|
|
$poste_val = $sposte;
|
|
}
|
|
|
|
$acc_operation->poste = $poste_val;
|
|
$acc_operation->amount = ${"e_other$i" . "_amount"};
|
|
$acc_operation->grpt = $seq;
|
|
$acc_operation->jrn = $p_jrn;
|
|
$acc_operation->type = 'd';
|
|
$acc_operation->periode = $tperiode;
|
|
$acc_operation->qcode = $e_bank_account;
|
|
$acc_operation->insert_jrnx();
|
|
|
|
|
|
if (sql_string(${"e_other$i" . "_comment"}) == null)
|
|
{
|
|
// if comment is blank set a default one
|
|
$comment = " compte : " . $fBank->strAttribut(ATTR_DEF_NAME) . ' a ' .
|
|
$fPoste->strAttribut(ATTR_DEF_NAME);
|
|
}
|
|
else
|
|
{
|
|
$comment = ${'e_other' . $i . '_comment'};
|
|
}
|
|
|
|
|
|
$acc_operation = new Acc_Operation($this->db);
|
|
$acc_operation->jrn = $p_jrn;
|
|
$acc_operation->amount = abs(${"e_other$i" . "_amount"});
|
|
$acc_operation->date = $e_date;
|
|
$acc_operation->desc = $comment;
|
|
$acc_operation->grpt = $seq;
|
|
$acc_operation->periode = $tperiode;
|
|
$acc_operation->mt = $mt;
|
|
$idx_operation++;
|
|
$acc_operation->pj = '';
|
|
|
|
if (trim($e_pj) != '' && $this->numb_operation() == true)
|
|
$acc_operation->pj = $e_pj . str_pad($idx_operation, 3, 0, STR_PAD_LEFT);
|
|
|
|
if (trim($e_pj) != '' && $this->numb_operation() == false)
|
|
$acc_operation->pj = $e_pj;
|
|
|
|
$jr_id = $acc_operation->insert_jrn();
|
|
// $acc_operation->set_pj();
|
|
$this->db->exec_sql('update jrn set jr_pj_number=$1 where jr_id=$2', array($acc_operation->pj, $jr_id));
|
|
$internal = $this->compute_internal_code($seq);
|
|
|
|
|
|
if (trim(${"e_concerned" . $i}) != "")
|
|
{
|
|
if (strpos(${"e_concerned" . $i}, ',') != 0)
|
|
{
|
|
$aRapt = explode(',', ${"e_concerned" . $i});
|
|
foreach ($aRapt as $rRapt)
|
|
{
|
|
// Add a "concerned operation to bound these op.together
|
|
//
|
|
$rec = new Acc_Reconciliation($this->db);
|
|
$rec->set_jr_id($jr_id);
|
|
|
|
if (isNumber($rRapt) == 1)
|
|
{
|
|
$rec->insert($rRapt);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
if (isNumber(${"e_concerned" . $i}) == 1)
|
|
{
|
|
$rec = new Acc_Reconciliation($this->db);
|
|
$rec->set_jr_id($jr_id);
|
|
$rec->insert(${"e_concerned$i"});
|
|
}
|
|
}
|
|
|
|
// Set Internal code
|
|
$this->grpt_id = $seq;
|
|
/**
|
|
* save also into quant_fin
|
|
*/
|
|
$this->insert_quant_fin($fBank->id, $jr_id, $fPoste->id, ${"e_other$i" . "_amount"});
|
|
|
|
if ($g_parameter->MY_ANALYTIC != "nu")
|
|
{
|
|
// for each item, insert into operation_analytique */
|
|
$op = new Anc_Operation($this->db);
|
|
$op->oa_group = $this->db->get_next_seq("s_oa_group"); /* for analytic */
|
|
$op->j_id = $j_id;
|
|
$op->oa_date = $e_date;
|
|
$op->oa_debit = ($amount < 0 ) ? 't' : 'f';
|
|
$op->oa_description = sql_string($comment);
|
|
$op->save_form_plan($_POST, $i, $j_id);
|
|
}
|
|
|
|
|
|
$this->update_internal_code($internal);
|
|
|
|
$js_detail = HtmlInput::detail_op($jr_id, $internal);
|
|
// Compute display
|
|
$row = td($e_date).td($js_detail) . td(${"e_other$i"}) . td($fPoste->strAttribut(ATTR_DEF_NAME)) . td(${"e_other" . $i . "_comment"}) . td(nbm(${"e_other$i" . "_amount"}), 'class="num"');
|
|
|
|
$ret.=tr($row);
|
|
|
|
|
|
if ($i == 0)
|
|
{
|
|
// first record we upload the files and
|
|
// keep variable to update other row of jrn
|
|
if (isset($_FILES))
|
|
$oid = $this->db->save_upload_document($seq);
|
|
}
|
|
else
|
|
{
|
|
if ($oid != 0)
|
|
{
|
|
$this->db->exec_sql("update jrn set jr_pj=" . $oid . ", jr_pj_name='" . $_FILES['pj']['name'] . "', " .
|
|
"jr_pj_type='" . $_FILES['pj']['type'] . "' where jr_grpt_id=$seq");
|
|
}
|
|
}
|
|
} // for nbitem
|
|
// increment pj
|
|
if (strlen(trim($e_pj)) != 0)
|
|
{
|
|
$this->inc_seq_pj();
|
|
}
|
|
$ret.='</table>';
|
|
}
|
|
catch (Exception $e)
|
|
{
|
|
echo '<span class="error">' .
|
|
'Erreur dans l\'enregistrement ' .
|
|
__FILE__ . ':' . __LINE__ . ' ' .
|
|
$e->getMessage();
|
|
$this->db->rollback();
|
|
exit();
|
|
}
|
|
$this->db->commit();
|
|
$r = "";
|
|
$r.="<br>Ancien solde " . nbm($solde);
|
|
$new_solde = bcadd($new_solde, $amount);
|
|
$r.="<br>Nouveau solde " . nbm($new_solde);
|
|
$ret.=$r;
|
|
return $ret;
|
|
}
|
|
|
|
/**\brief display operation of a FIN ledger
|
|
* \return html code into a string
|
|
*/
|
|
|
|
function show_ledger()
|
|
{
|
|
global $g_user;
|
|
echo dossier::hidden();
|
|
$hid = new IHidden();
|
|
|
|
$hid->name = "p_action";
|
|
$hid->value = "bank";
|
|
echo $hid->input();
|
|
|
|
|
|
$hid->name = "sa";
|
|
$hid->value = "l";
|
|
echo $hid->input();
|
|
|
|
|
|
$w = new ISelect();
|
|
// filter on the current year
|
|
$filter_year = " where p_exercice='" . $g_user->get_exercice() . "'";
|
|
|
|
$periode_start = $this->db->make_array("select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end", 1);
|
|
// User is already set User=new User($this->db);
|
|
$current = (isset($_GET['p_periode'])) ? $_GET['p_periode'] : -1;
|
|
$w->selected = $current;
|
|
|
|
echo '<form>';
|
|
echo 'Période ' . $w->input("p_periode", $periode_start);
|
|
$wLedger = $this->select_ledger('fin', 3);
|
|
|
|
if ($wLedger == null)
|
|
exit(_('Pas de journal disponible'));
|
|
|
|
if (count($wLedger->value) > 1)
|
|
{
|
|
$aValue = $wLedger->value;
|
|
$wLedger->value[0] = array('value' => -1, 'label' => _('Tous les journaux financiers'));
|
|
$idx = 1;
|
|
foreach ($aValue as $a)
|
|
{
|
|
$wLedger->value[$idx] = $a;
|
|
$idx++;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
echo 'Journal ' . $wLedger->input();
|
|
$w = new ICard();
|
|
$w->noadd = 'no';
|
|
$w->jrn = $this->id;
|
|
$qcode = (isset($_GET['qcode'])) ? $_GET['qcode'] : "";
|
|
echo dossier::hidden();
|
|
echo HtmlInput::hidden('p_action', 'bank');
|
|
echo HtmlInput::hidden('sa', 'l');
|
|
$w->name = 'qcode';
|
|
$w->value = $qcode;
|
|
$w->label = '';
|
|
$this->type = 'FIN';
|
|
$all = $this->get_all_fiche_def();
|
|
$w->extra = $all;
|
|
$w->extra2 = 'QuickCode';
|
|
$sp = new ISpan();
|
|
echo $sp->input("qcode_label", "", $qcode);
|
|
echo $w->input();
|
|
|
|
echo HtmlInput::submit('gl_submit', _('Rechercher'));
|
|
echo '</form>';
|
|
|
|
// Show list of sell
|
|
// Date - date of payment - Customer - amount
|
|
if ($current != -1)
|
|
{
|
|
$filter_per = " and jr_tech_per=" . $current;
|
|
}
|
|
else
|
|
{
|
|
$filter_per = " and jr_tech_per in (select p_id from parm_periode where p_exercice::integer=" .
|
|
$g_user->get_exercice() . ")";
|
|
}
|
|
/* security */
|
|
if ($this->id != -1)
|
|
$available_ledger = " and jr_def_id= " . $this->id . " and " . $g_user->get_ledger_sql();
|
|
else
|
|
$available_ledger = " and " . $g_user->get_ledger_sql();
|
|
// Show list of sell
|
|
// Date - date of payment - Customer - amount
|
|
$sql = SQL_LIST_ALL_INVOICE . $filter_per . " and jr_def_type='FIN'" .
|
|
" $available_ledger";
|
|
$step = $_SESSION['g_pagesize'];
|
|
$page = (isset($_GET['offset'])) ? $_GET['page'] : 1;
|
|
$offset = (isset($_GET['offset'])) ? $_GET['offset'] : 0;
|
|
|
|
$l = "";
|
|
|
|
// check if qcode contains something
|
|
if ($qcode != "")
|
|
{
|
|
// add a condition to filter on the quick code
|
|
$l = " and jr_grpt_id in (select j_grpt from jrnx where j_qcode=upper('$qcode')) ";
|
|
}
|
|
|
|
list($max_line, $list) = ListJrn($this->db, "where jrn_def_type='FIN' $filter_per $l $available_ledger "
|
|
, null, $offset, 0);
|
|
$bar = navigation_bar($offset, $max_line, $step, $page);
|
|
|
|
echo "<hr> $bar";
|
|
echo $list;
|
|
echo "$bar <hr>";
|
|
}
|
|
|
|
/**
|
|
* return a string with the bank account, name and quick_code
|
|
*/
|
|
function get_bank_name()
|
|
{
|
|
$this->bank_id = $this->db->get_value('select jrn_def_bank from jrn_def where jrn_def_id=$1', array($this->id));
|
|
$fBank = new Fiche($this->db, $this->bank_id);
|
|
$e_bank_account = " : " . $fBank->strAttribut(ATTR_DEF_BQ_NO);
|
|
$e_bank_name = " : " . $fBank->strAttribut(ATTR_DEF_NAME);
|
|
$e_bank_qcode = ": " . $fBank->strAttribut(ATTR_DEF_QUICKCODE);
|
|
return $e_bank_qcode . $e_bank_name . $e_bank_account;
|
|
}
|
|
|
|
/**
|
|
* return the fiche_id of the bank
|
|
*/
|
|
function get_bank()
|
|
{
|
|
$bank_id = $this->db->get_value('select jrn_def_bank from jrn_def where jrn_def_id=$1', array($this->id));
|
|
return $bank_id;
|
|
}
|
|
|
|
/**
|
|
* return true is we numbere each operation
|
|
*/
|
|
function numb_operation()
|
|
{
|
|
$a = $this->db->get_value('select jrn_def_num_op from jrn_def where jrn_def_id=$1', array($this->id));
|
|
if ($a == 1)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* insert into the quant_fin table
|
|
* @param $bank_id is the f_id of the bank
|
|
* @param $jr_id is the jrn.jr_id of the operation
|
|
* @param $other is the f_id of the benefit
|
|
* @param $amount is the amount
|
|
*/
|
|
function insert_quant_fin($p_bankid, $p_jrid, $p_otherid, $p_amount)
|
|
{
|
|
$sql = "INSERT INTO quant_fin(qf_bank, jr_id, qf_other, qf_amount)
|
|
VALUES ($1, $2, $3, $4);";
|
|
|
|
$this->db->exec_sql($sql, array($p_bankid, $p_jrid, $p_otherid, round($p_amount, 2)));
|
|
}
|
|
|
|
}
|