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 ........
452 lines
15 KiB
PHP
452 lines
15 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 Manage the anticipation, prediction of sales, expense, bank...
|
|
*
|
|
*/
|
|
/**
|
|
*@brief Manage the anticipation of expense, sales,...
|
|
*@see Forecast Forecast_Cat Forecast_Item
|
|
*
|
|
*/
|
|
require_once 'class_forecast.php';
|
|
require_once 'class_forecast_cat.php';
|
|
require_once 'class_forecast_item.php';
|
|
require_once 'class_fiche.php';
|
|
require_once 'class_acc_account_ledger.php';
|
|
require_once 'class_periode.php';
|
|
require_once 'class_impress.php';
|
|
|
|
class Anticipation
|
|
{
|
|
/* example private $variable=array("val1"=>1,"val2"=>"Seconde valeur","val3"=>0); */
|
|
private static $variable=array ("id"=>"f_id","name"=>"f_name");
|
|
private $cn;
|
|
var $cat; /*!< array of object categorie (forecast_cat)*/
|
|
var $item; /*< array of object item (forecast_item) */
|
|
/**
|
|
* @brief constructor
|
|
* @param $p_init Database object
|
|
*/
|
|
function __construct ($p_init,$p_id=0)
|
|
{
|
|
$this->cn=$p_init;
|
|
$this->f_id=$p_id;
|
|
}
|
|
public function get_parameter($p_string)
|
|
{
|
|
if ( array_key_exists($p_string,self::$variable) )
|
|
{
|
|
$idx=self::$variable[$p_string];
|
|
return $this->$idx;
|
|
}
|
|
else
|
|
exit (__FILE__.":".__LINE__."[$p_string]".'Erreur attribut inexistant');
|
|
}
|
|
public function set_parameter($p_string,$p_value)
|
|
{
|
|
if ( array_key_exists($p_string,self::$variable) )
|
|
{
|
|
$idx=self::$variable[$p_string];
|
|
$this->$idx=$p_value;
|
|
}
|
|
else
|
|
exit (__FILE__.":".__LINE__."[$p_string]".'Erreur attribut inexistant');
|
|
|
|
|
|
}
|
|
public function get_info()
|
|
{
|
|
return var_export(self::$variable,true);
|
|
}
|
|
public function verify()
|
|
{
|
|
// Verify that the elt we want to add is correct
|
|
// the f_name must be unique (case insensitive)
|
|
return 0;
|
|
}
|
|
public function save()
|
|
{
|
|
/* please adapt */
|
|
if ( $this->get_parameter("id") == 0 )
|
|
$this->insert();
|
|
else
|
|
$this->update();
|
|
}
|
|
|
|
public function insert()
|
|
{
|
|
if ( $this->verify() != 0 ) return;
|
|
}
|
|
|
|
public function update()
|
|
{}
|
|
|
|
public function load()
|
|
{}
|
|
/**
|
|
*@brief Display the result of the forecast
|
|
*@param $p_periode
|
|
*@return HTML String with the code
|
|
*/
|
|
public function display()
|
|
{
|
|
bcscale(4);
|
|
$forecast=new Forecast($this->cn,$this->f_id);
|
|
$forecast->load();
|
|
$str_name=h($forecast->get_parameter('name'));
|
|
|
|
$start=$forecast->get_parameter('start_date');
|
|
$end=$forecast->get_parameter('end_date');
|
|
|
|
if ( $start=='') throw new Exception (_('Période de début non valable'));
|
|
if ( $end=='') throw new Exception (_('Période de fin non valable'));
|
|
|
|
$per=new Periode($this->cn,$start);
|
|
$str_start=format_date($per->first_day());
|
|
|
|
$per=new Periode($this->cn,$end);
|
|
$str_end=format_date($per->last_day());
|
|
|
|
|
|
$r="";
|
|
$aCat=$this->cn->get_array('select fc_id,fc_desc from forecast_cat where f_id=$1 order by fc_order',array($this->f_id));
|
|
$aItem=array();
|
|
$aReal=array();
|
|
$poste=new Acc_Account_Ledger($this->cn,0);
|
|
$fiche=new Fiche($this->cn);
|
|
$aPeriode=$this->cn->get_array("select p_id,to_char(p_start,'MM.YYYY') as myear from parm_periode
|
|
where p_start >= (select p_start from parm_periode where p_id=$start)
|
|
and p_end <= (select p_end from parm_periode where p_id=$end)
|
|
order by p_start;");
|
|
$error=array();
|
|
for($j=0;$j<count($aCat);$j++)
|
|
{
|
|
$aItem[$j]=$this->cn->get_array('select fi_card,fi_account,fi_text,fi_amount,fi_debit from forecast_item where fc_id=$1 and fi_pid=0 order by fi_order ',array($aCat[$j]['fc_id']));
|
|
$aPerMonth[$j]=$this->cn->get_array('select fi_pid,fi_card,fi_account,fi_text,fi_amount,fi_debit from forecast_item where fc_id=$1 and fi_pid !=0 order by fi_order ',array($aCat[$j]['fc_id']));
|
|
|
|
/* compute the real amount for periode */
|
|
for($k=0;$k<count($aItem[$j]);$k++)
|
|
{
|
|
/* for each periode */
|
|
for ($l=0;$l<count($aPeriode);$l++)
|
|
{
|
|
if ($aItem[$j][$k]['fi_account']=='')
|
|
{
|
|
$fiche->id=$aItem[$j][$k]['fi_card'];
|
|
$amount=$fiche->get_solde_detail("j_tech_per = ".$aPeriode[$l]['p_id']);
|
|
if ($aItem[$j][$k]['fi_debit']=='C' && $amount['debit']>$amount['credit']) $amount['solde']=$amount["solde"]*(-1);
|
|
if ($aItem[$j][$k]['fi_debit']=='D' && $amount['debit']<$amount['credit']) $amount['solde']=$amount["solde"]*(-1);
|
|
|
|
}
|
|
else
|
|
{
|
|
$poste->id=$aItem[$j][$k]['fi_account'];
|
|
$aresult=Impress::parse_formula($this->cn,"OK",$poste->id,$aPeriode[$l]['p_id'],$aPeriode[$l]['p_id']);
|
|
$tmp_label=$aresult['desc'];
|
|
$amount['solde']=$aresult['montant'];
|
|
|
|
if ( $tmp_label != 'OK') $error[]="<li> ".$aItem[$j][$k]['fi_text'].$poste->id.'</li>';
|
|
}
|
|
$aReal[$j][$k][$l]=$amount['solde'];
|
|
}
|
|
}
|
|
|
|
}
|
|
ob_start();
|
|
require_once('template/forecast_result.php');
|
|
$r.=ob_get_contents();
|
|
ob_end_clean();
|
|
return $r;
|
|
}
|
|
public static function div()
|
|
{
|
|
$r='<div id="div_anti" style="display:none">';
|
|
$r.= '</div>';
|
|
return $r;
|
|
}
|
|
public function delete()
|
|
{}
|
|
/**
|
|
*@brief Display a form for modifying the name or/and the category of an existing
|
|
* anticipation
|
|
*@return html string with the form
|
|
*/
|
|
private function form_cat_mod()
|
|
{
|
|
$a=new Forecast($this->cn,$this->f_id);
|
|
$a->load();
|
|
$name=new IText('an_name');
|
|
$name->value=$a->get_parameter("name");
|
|
$str_name=$name->input();
|
|
$str_action=_('Modification');
|
|
|
|
$start_date=new IPeriod('start_date');
|
|
$start_date->type=ALL;
|
|
$start_date->cn=$this->cn;
|
|
$start_date->show_end_date=false;
|
|
$start_date->show_start_date=true;
|
|
$start_date->user=$g_user;
|
|
$start_date->filter_year=false;
|
|
|
|
$end_date=new IPeriod('end_date');
|
|
$end_date->type=ALL;
|
|
$end_date->cn=$this->cn;
|
|
$end_date->show_end_date=true;
|
|
$end_date->show_start_date=false;
|
|
$end_date->user=$g_user;
|
|
$end_date->filter_year=false;
|
|
|
|
$start_date->value=$a->f_start_date;
|
|
$end_date->value=$a->f_end_date;
|
|
|
|
$str_start_date=$start_date->input();
|
|
$str_end_date=$end_date->input();
|
|
|
|
|
|
$r=HtmlInput::hidden('f_id',$this->f_id);
|
|
$array=Forecast_Cat::load_all($this->cn,$this->f_id);
|
|
|
|
for ($i=0;$i<MAX_CAT;$i++)
|
|
{
|
|
/* category name */
|
|
$name_name=(isset($array[$i]['fc_id']))?'fr_cat'.$array[$i]['fc_id']:'fr_cat_new'.$i;
|
|
$name=new IText($name_name);
|
|
$name->value=(isset ($array[$i]['fc_desc']))?$array[$i]['fc_desc']:'';
|
|
$aCat[$i]['name']=$name->input();
|
|
|
|
|
|
/* category order */
|
|
$order_name=(isset($array[$i]['fc_id']))?'fc_order'.$array[$i]['fc_id']:'fc_order_new'.$i;
|
|
$order=new IText($order_name);
|
|
$order->value=(isset($array[$i]['fc_order']))?$array[$i]['fc_order']:$i+1;
|
|
$aCat[$i]['order']=$order->input();
|
|
}
|
|
|
|
ob_start();
|
|
require_once('template/forecast_cat.php');
|
|
$r.=ob_get_contents();
|
|
ob_end_clean();
|
|
return $r;
|
|
}
|
|
/**
|
|
*@brief Display a form for adding an new anticipation
|
|
*@return html string with the form
|
|
*/
|
|
private function form_cat_new()
|
|
{
|
|
global $g_user;
|
|
$r="";
|
|
$str_action=_('Nouveau');
|
|
|
|
$name=new IText('an_name');
|
|
$str_name=$name->input();
|
|
|
|
$start_date=new IPeriod('start_date');
|
|
$start_date->type=ALL;
|
|
$start_date->cn=$this->cn;
|
|
$start_date->show_end_date=false;
|
|
$start_date->show_start_date=true;
|
|
$start_date->user=$g_user;
|
|
$start_date->filter_year=false;
|
|
|
|
$end_date=new IPeriod('end_date');
|
|
$end_date->type=ALL;
|
|
$end_date->cn=$this->cn;
|
|
$end_date->show_end_date=true;
|
|
$end_date->show_start_date=false;
|
|
$end_date->user=$g_user;
|
|
$end_date->filter_year=false;
|
|
|
|
$period=$g_user->get_periode();
|
|
$per=new Periode($this->cn,$period);
|
|
$year=$per->get_exercice();
|
|
|
|
list($per_start,$per_end)=$per->get_limit($year);
|
|
$start_date->value=$per_start->p_id;
|
|
$end_date->value=$per_end->p_id;
|
|
|
|
$str_start_date=$start_date->input();
|
|
$str_end_date=$end_date->input();
|
|
|
|
$aLabel=array(_('Ventes'),_('Dépense'),_('Banque'));
|
|
$aCat=array();
|
|
|
|
for ($i=0;$i<MAX_CAT;$i++)
|
|
{
|
|
/* category name */
|
|
$name=new IText('fr_cat'.$i);
|
|
$name->value=(isset($aLabel[$i]))?$aLabel[$i]:'';
|
|
$aCat[$i]['name']=$name->input();
|
|
|
|
|
|
/* category order */
|
|
$order=new IText('fr_order'.$i);
|
|
$order->value=$i+1;
|
|
$aCat[$i]['order']=$order->input();
|
|
}
|
|
|
|
ob_start();
|
|
require_once('template/forecast_cat.php');
|
|
$r.=ob_get_contents();
|
|
ob_end_clean();
|
|
return $r;
|
|
|
|
}
|
|
/**
|
|
* @brief create an empty object anticipation
|
|
* @return html string with the form
|
|
*/
|
|
public function form_cat()
|
|
{
|
|
if ($this->f_id != 0)
|
|
return $this->form_cat_mod();
|
|
else
|
|
return $this->form_cat_new();
|
|
}
|
|
/**
|
|
*@brief display a form for modifying or add a forecast
|
|
*@return HTML code
|
|
*/
|
|
public function form_item()
|
|
{
|
|
$forecast=new Forecast($this->cn,$this->f_id);
|
|
$forecast->load();
|
|
$str_name=$forecast->get_parameter('name');
|
|
$str_start=$forecast->get_parameter('start_date');
|
|
$str_end=$forecast->get_parameter('end_date');
|
|
|
|
|
|
$r="";
|
|
$str_action=_("Elements");
|
|
$cat=new Forecast_Cat($this->cn);
|
|
$array=$cat->make_array($this->f_id);
|
|
$periode=new Periode($this->cn);
|
|
$aPeriode=$this->cn->make_array("select p_id,to_char(p_start,'MM.YYYY') as label from parm_periode
|
|
where p_start >= (select p_start from parm_periode where p_id=$str_start)
|
|
and p_end <= (select p_end from parm_periode where p_id=$str_end)
|
|
order by p_start");
|
|
$aPeriode[]=array('value'=>0,'label'=>'Mensuel');
|
|
$value=$this->cn->get_array("select fi_id,fi_text,fi_account,fi_card,fc_id,fi_amount,fi_debit,fi_pid ".
|
|
" from forecast_item ".
|
|
" where fc_id in (select fc_id from forecast_cat where f_id = $1)",array($this->f_id));
|
|
$max=(count($value) < MAX_FORECAST_ITEM)?MAX_FORECAST_ITEM:count($value);
|
|
$r.=HtmlInput::hidden('nbrow',$max);
|
|
|
|
for ($i=0;$i<$max;$i++)
|
|
{
|
|
if (isset($value[$i]['fi_id']))
|
|
{
|
|
$r.=HtmlInput::hidden('fi_id'.$i,$value[$i]['fi_id']);
|
|
}
|
|
/* category*/
|
|
$category=new ISelect();
|
|
$category->name='an_cat'.$i;
|
|
$category->value=$array;
|
|
$category->selected=(isset($value[$i]["fc_id"]))?$value[$i]["fc_id"]:-1;
|
|
$aCat[$i]['cat']=$category->input();
|
|
|
|
/* amount */
|
|
$amount=new INum('an_cat_amount'.$i);
|
|
$amount->value=(isset($value[$i]["fi_amount"]))?$value[$i]["fi_amount"]:0;
|
|
$aCat[$i]['amount']=$amount->input();
|
|
|
|
/* Accounting*/
|
|
$account=new IPoste('an_cat_acc'.$i);
|
|
$account->set_attribute('ipopup','ipop_account');
|
|
// $account->set_attribute('label','an_label'.$i);
|
|
$account->set_attribute('account','an_cat_acc'.$i);
|
|
$account->set_attribute('bracket',1);
|
|
$account->set_attribute('no_overwrite',1);
|
|
$account->set_attribute('noquery',1);
|
|
$account->css_size="85%";
|
|
$account->value=(isset($value[$i]["fi_account"]))?$value[$i]["fi_account"]:"";
|
|
$aCat[$i]['account']=$account->input();
|
|
/*Quick Code */
|
|
$qc=new ICard('an_qc'.$i);
|
|
// If double click call the javascript fill_ipopcard
|
|
$qc->set_dblclick("fill_ipopcard(this);");
|
|
|
|
// This attribute is mandatory, it is the name of the IPopup
|
|
$qc->set_attribute('ipopup','ipopcard');
|
|
|
|
// name of the field to update with the name of the card
|
|
$qc->set_attribute('label','an_label'.$i);
|
|
|
|
// Type of card : all
|
|
$qc->set_attribute('typecard','all');
|
|
$qc->set_attribute('jrn',0);
|
|
$qc->extra='all';
|
|
|
|
// when value selected in the autcomplete
|
|
$qc->set_function('fill_data');
|
|
if (isset($value[$i]["fi_card"]))
|
|
{
|
|
$f=new Fiche($this->cn,$value[$i]["fi_card"]);
|
|
$qc->value=$f->strAttribut(ATTR_DEF_QUICKCODE);
|
|
;
|
|
}
|
|
|
|
$aCat[$i]['qc']=$qc->search().$qc->input();
|
|
/* Label */
|
|
$label=new IText('an_label'.$i);
|
|
$label->value=(isset($value[$i]["fi_text"]))?$value[$i]["fi_text"]:"";
|
|
$aCat[$i]['name']=$label->input();
|
|
|
|
//Deb or Cred
|
|
$deb=new ISelect('an_deb'.$i);
|
|
$deb->selected=(isset($value[$i]["fi_debit"]))?$value[$i]["fi_debit"]:-1;
|
|
$deb->value=array(array('value'=>'D','label'=>_('Débit')),
|
|
array('value'=>'C','label'=>_('Crédit'))
|
|
);
|
|
$aCat[$i]['deb']=$deb->input();
|
|
//Periode
|
|
$isPeriode=new ISelect('month'.$i);
|
|
$isPeriode->value=$aPeriode;
|
|
$isPeriode->selected=(isset($value[$i]["fi_pid"]))?$value[$i]["fi_pid"]:0;
|
|
$aCat[$i]['per']=$isPeriode->input();
|
|
}
|
|
$add_row=new IButton('add_row');
|
|
$add_row->label=_('Ajouter une ligne');
|
|
$add_row->javascript='for_add_row(\'fortable\')';
|
|
$f_add_row=$add_row->input();
|
|
ob_start();
|
|
require_once('template/forecast-detail.php');
|
|
$r.=ob_get_contents();
|
|
ob_end_clean();
|
|
return $r;
|
|
}
|
|
/**
|
|
* @brief unit test
|
|
*/
|
|
static function test_me()
|
|
{
|
|
$cn=new Database(dossier::id());
|
|
$test=new Anticipation($cn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
?>
|