Commit e8855a6d7c296adf1b52bc40fdedaa3c8cd55503

Authored by aspangaro
1 parent d5926c1b
Exists in 3.5 and in 1 other branch 3.6

Fix :: Custom install is ok

Update Copyright
Rename "MenuProductAccount" into "Tools"
Showing 38 changed files with 224 additions and 206 deletions   Show diff stats
accountingex/admin/account.php
1 1 <?php
2 2 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
4   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  3 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
5 5 *
6 6 * This program is free software; you can redistribute it and/or modify
7 7 * it under the terms of the GNU General Public License as published by
... ... @@ -31,13 +31,13 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
31 31 if (! $res) die("Include of main fails");
32 32  
33 33 // Class
34   -dol_include_once ( "/accountingex/core/lib/account.lib.php" );
35   -dol_include_once ( "/accountingex/class/accountingaccount.class.php" );
36   -dol_include_once ( "/accountingex/class/html.formventilation.class.php" );
  34 +dol_include_once("/accountingex/core/lib/account.lib.php");
  35 +dol_include_once("/accountingex/class/accountingaccount.class.php");
  36 +dol_include_once("/accountingex/class/html.formventilation.class.php");
37 37  
38 38 // Langs
39   -$langs->load ( "compta" );
40   -$langs->load ( "accountingex@accountingex" );
  39 +$langs->load ("compta");
  40 +$langs->load ("accountingex@accountingex");
41 41  
42 42 $mesg = '';
43 43 $action = GETPOST ( 'action' );
... ...
accountingex/admin/fiche.php
1 1 <?PHP
2 2 /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -31,13 +31,13 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
31 31 if (! $res) die("Include of main fails");
32 32  
33 33 // Class
34   -dol_include_once ( "/accountingex/core/lib/account.lib.php" );
35   -dol_include_once ( "/accountingex/class/accountingaccount.class.php" );
36   -dol_include_once ( "/accountingex/class/html.formventilation.class.php" );
  34 +dol_include_once("/accountingex/core/lib/account.lib.php");
  35 +dol_include_once("/accountingex/class/accountingaccount.class.php");
  36 +dol_include_once("/accountingex/class/html.formventilation.class.php");
37 37  
38 38 // Langs
39   -$langs->load ( "bills" );
40   -$langs->load ( "accountingex@accountingex" );
  39 +$langs->load ("bills");
  40 +$langs->load ("accountingex@accountingex");
41 41  
42 42 $mesg = '';
43 43 $action = GETPOST ( 'action' );
... ...
accountingex/admin/fiscalyear.php
1 1 <?php
2   -/* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
3   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  2 +/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  3 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
4 4 *
5 5 * This program is free software; you can redistribute it and/or modify
6 6 * it under the terms of the GNU General Public License as published by
... ... @@ -29,8 +29,9 @@ if (! $res &amp;&amp; file_exists(&quot;../../main.inc.php&quot;)) $res=@include(&quot;../../main.inc.p
29 29 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
30 30 if (! $res) die("Include of main fails");
31 31  
32   -require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
33   -dol_include_once ( "/accountingex/class/fiscalyear.class.php");
  32 +// Class
  33 +dol_include_once("/core/lib/date.lib.php");
  34 +dol_include_once("/accountingex/class/fiscalyear.class.php");
34 35  
35 36 $langs->load("companies");
36 37 $langs->load("admin");
... ...
accountingex/admin/importaccounts.php
... ... @@ -2,8 +2,8 @@
2 2 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
4 4 * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
5   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
6   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
  5 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  6 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
7 7 *
8 8 * This program is free software; you can redistribute it and/or modify
9 9 * it under the terms of the GNU General Public License as published by
... ... @@ -34,9 +34,9 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
34 34 if (! $res) die("Include of main fails");
35 35  
36 36 // Class
37   -dol_include_once ( "/accountingex/core/lib/account.lib.php");
38   -dol_include_once ( "/accountingex/class/accountingaccount.class.php");
39   -dol_include_once ( "/accountingex/class/html.formventilation.class.php");
  37 +dol_include_once("/accountingex/core/lib/account.lib.php");
  38 +dol_include_once("/accountingex/class/accountingaccount.class.php");
  39 +dol_include_once("/accountingex/class/html.formventilation.class.php");
40 40  
41 41 // langs
42 42 $langs->load("compta");
... ...
accountingex/admin/index.php
1 1 <?php
2 2 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  4 + * Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -32,7 +32,8 @@ if (! $res &amp;&amp; file_exists(&quot;../../main.inc.php&quot;)) $res=@include(&quot;../../main.inc.p
32 32 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
33 33 if (! $res) die("Include of main fails");
34 34  
35   -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
  35 +// Class
  36 +dol_include_once("/core/lib/admin.lib.php");
36 37  
37 38 $langs->load("compta");
38 39 $langs->load("bills");
... ...
accountingex/admin/info.php
1 1 <?php
2 2 /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -24,16 +24,17 @@
24 24 * \brief Page to show an account information
25 25 */
26 26  
27   - $res=@include("../main.inc.php");
  27 +// Dolibarr environment
  28 +$res=@include("../main.inc.php");
28 29 if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php");
29 30 if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
30 31 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
31 32 if (! $res) die("Include of main fails");
32 33  
33 34 // Class
34   -dol_include_once ( "/accountingex/core/lib/account.lib.php");
35   -dol_include_once ( "/accountingex/class/accountingaccount.class.php");
36   -dol_include_once ( "/core/lib/functions2.lib.php");
  35 +dol_include_once("/accountingex/core/lib/account.lib.php");
  36 +dol_include_once("/accountingex/class/accountingaccount.class.php");
  37 +dol_include_once("/core/lib/functions2.lib.php");
37 38  
38 39 $langs->load("accountingex@accountingex");
39 40  
... ...
accountingex/admin/productaccount.php
1 1 <?PHP
2 2 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
9   - * the Free Software Foundation; either version 2 of the License, or
  9 + * the Free Software Foundation; either version 3 of the License, or
10 10 * (at your option) any later version.
11 11 *
12 12 * This program is distributed in the hope that it will be useful,
... ... @@ -16,15 +16,13 @@
16 16 *
17 17 * You should have received a copy of the GNU General Public License
18 18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19   - *
20   - * $Id: liste.php,v 1.12 2011/07/31 22:23:31 eldy Exp $
21 19 */
22 20  
23 21 /**
24   - \file accountingex/admin/thirdpartyaccount.php
25   - \ingroup compta
26   - \brief Onglet de gestion de parametrages des ventilations
27   -*/
  22 + * \file accountingex/admin/productaccount.php
  23 + * \ingroup Accounting Expert
  24 + * \brief Onglet de gestion de parametrages des ventilations
  25 + */
28 26  
29 27 // Dolibarr environment
30 28 $res=@include("../main.inc.php");
... ... @@ -33,8 +31,9 @@ if (! $res &amp;&amp; file_exists(&quot;../../main.inc.php&quot;)) $res=@include(&quot;../../main.inc.p
33 31 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
34 32 if (! $res) die("Include of main fails");
35 33  
36   -require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
37   -require_once (DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php");
  34 +// Class
  35 +dol_include_once("/core/lib/report.lib.php");
  36 +dol_include_once("/core/lib/date.lib.php");
38 37  
39 38 $langs->load("companies");
40 39 $langs->load("compta");
... ...
accountingex/admin/thirdpartyaccount.php
1 1 <?PHP
2 2 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
9   - * the Free Software Foundation; either version 2 of the License, or
  9 + * the Free Software Foundation; either version 3 of the License, or
10 10 * (at your option) any later version.
11 11 *
12 12 * This program is distributed in the hope that it will be useful,
... ... @@ -16,15 +16,13 @@
16 16 *
17 17 * You should have received a copy of the GNU General Public License
18 18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19   - *
20   - * $Id: liste.php,v 1.12 2011/07/31 22:23:31 eldy Exp $
21 19 */
22 20  
23 21 /**
24   - \file accountingex/admin/thirdpartyaccount.php
25   - \ingroup compta
26   - \brief Onglet de gestion de parametrages des ventilations
27   -*/
  22 + * \file accountingex/admin/thirdpartyaccount.php
  23 + * \ingroup Accounting Expert
  24 + * \brief Onglet de gestion de parametrages des ventilations
  25 + */
28 26  
29 27 // Dolibarr environment
30 28 $res=@include("../main.inc.php");
... ... @@ -33,8 +31,9 @@ if (! $res &amp;&amp; file_exists(&quot;../../main.inc.php&quot;)) $res=@include(&quot;../../main.inc.p
33 31 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
34 32 if (! $res) die("Include of main fails");
35 33  
36   -require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
37   -require_once (DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php");
  34 +// Class
  35 +dol_include_once("/core/lib/report.lib.php");
  36 +dol_include_once("/core/lib/date.lib.php");
38 37  
39 38 $langs->load("companies");
40 39 $langs->load("compta");
... ...
accountingex/bookkeeping/balancebymonth.php
1 1 <?php
2 2 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -32,7 +32,8 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
32 32 if (! $res) die("Include of main fails");
33 33  
34 34 // Class
35   -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
  35 +dol_include_once("/core/lib/date.lib.php");
  36 +dol_include_once("accountingex/core/lib/account.lib.php");
36 37  
37 38 // Langs
38 39 $langs->load("main");
... ... @@ -61,7 +62,7 @@ llxHeader(&#39;&#39;,$langs-&gt;trans(&quot;CustomersVentilation&quot;));
61 62 $textprevyear="<a href=\"balancebymonth.php?year=" . ($year_current-1) . "\">".img_previous()."</a>";
62 63 $textnextyear=" <a href=\"balancebymonth.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
63 64  
64   -print_fiche_titre("Balance $textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
  65 +print_fiche_titre($langs->trans("AccountBalance").' '.$textprevyear.' '.$langs->trans("Year").' '.$year_start.' '.$textnextyear);
65 66  
66 67 $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet as fd";
67 68 $sql.= " , ".MAIN_DB_PREFIX."facture as f";
... ... @@ -115,7 +116,7 @@ if ($resql)
115 116  
116 117 $row = $db->fetch_row($resql);
117 118  
118   - print '<tr><td width="14%">'.$row[0].'</td>';
  119 + print '<tr><td width="14%">'.length_accountg($row[0]).'</td>';
119 120 print '<td align="right" width="6.5%">'.$row[1].'</td>';
120 121 print '<td align="right" width="6.5%">'.$row[2].'</td>';
121 122 print '<td align="right" width="6.5%">'.$row[3].'</td>';
... ... @@ -181,7 +182,7 @@ if ($resql)
181 182  
182 183 $row = $db->fetch_row($resql);
183 184  
184   - print '<tr><td width="14%">'.$row[0].'</td>';
  185 + print '<tr><td width="14%">'.length_accountg($row[0]).'</td>';
185 186 print '<td align="right" width="6.5%">'.$row[1].'</td>';
186 187 print '<td align="right" width="6.5%">'.$row[2].'</td>';
187 188 print '<td align="right" width="6.5%">'.$row[3].'</td>';
... ...
accountingex/bookkeeping/fiche.php
1 1 <?php
2 2 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
5 5 * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
  6 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 7 *
7 8 * This program is free software; you can redistribute it and/or modify
8 9 * it under the terms of the GNU General Public License as published by
... ... @@ -34,10 +35,10 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
34 35 if (! $res) die("Include of main fails");
35 36  
36 37 // Class
37   -require_once DOL_DOCUMENT_ROOT .'/accountingex/class/bookkeeping.class.php';
  38 +dol_include_once("accountingex/class/bookkeeping.class.php");
38 39  
39 40 // Langs
40   -$langs->load ( "accountingex@accountingex" );
  41 +$langs->load("accountingex@accountingex");
41 42  
42 43 $mesg = '';
43 44 $action = GETPOST ( 'action' );
... ...
accountingex/bookkeeping/liste.php
1 1 <?php
2 2 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
5 5 * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
6 6 * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
7 7 *
... ... @@ -33,9 +33,10 @@ if (! $res &amp;&amp; file_exists(&quot;../../main.inc.php&quot;)) $res=@include(&quot;../../main.inc.p
33 33 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
34 34 if (! $res) die("Include of main fails");
35 35  
36   -dol_include_once ( "/accountingex/class/html.formventilation.class.php");
37   -dol_include_once ( "/accountingex/class/bookkeeping.class.php");
38   -dol_include_once ( "/accountingex/core/lib/account.lib.php" );
  36 +// Class
  37 +dol_include_once("/accountingex/class/html.formventilation.class.php");
  38 +dol_include_once("/accountingex/class/bookkeeping.class.php");
  39 +dol_include_once("/accountingex/core/lib/account.lib.php");
39 40  
40 41 $page = GETPOST ( "page" );
41 42 $sortorder = GETPOST ( "sortorder" );
... ...
accountingex/bookkeeping/listebyyear.php
... ... @@ -2,8 +2,8 @@
2 2 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
4 4 * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
5   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
6   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  5 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  6 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
7 7 *
8 8 * This program is free software; you can redistribute it and/or modify
9 9 * it under the terms of the GNU General Public License as published by
... ... @@ -34,7 +34,8 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
34 34 if (! $res) die("Include of main fails");
35 35  
36 36 // Class
37   -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
  37 +dol_include_once("/core/lib/date.lib.php");
  38 +dol_include_once("/accountingex/core/lib/account.lib.php");
38 39  
39 40 // Langs
40 41 $langs->load("accountingex@accountingex");
... ... @@ -93,7 +94,6 @@ if ($resql)
93 94 print_liste_field_titre($langs->trans("Debit"));
94 95 print_liste_field_titre($langs->trans("Credit"));
95 96 print_liste_field_titre($langs->trans("Amount"));
96   - print_liste_field_titre($langs->trans("Sens"));
97 97 print "</tr>\n";
98 98  
99 99 $var=True;
... ... @@ -110,14 +110,13 @@ if ($resql)
110 110 print '</a>&nbsp;'.$obj->doc_type.'</td>'."\n";
111 111 print '<td>'.dol_print_date($db->jdate($obj->doc_date)).'</td>';
112 112 print '<td>'.$obj->doc_ref.'</td>';
113   - print '<td>'.$obj->numero_compte.'</td>';
114   - print '<td>'.$obj->code_tiers.'</td>';
  113 + print '<td>'.length_accountg($obj->numero_compte).'</td>';
  114 + print '<td>'.length_accounta($obj->code_tiers).'</td>';
115 115 print '<td>'.$obj->label_compte.'</td>';
116 116 print '<td align="right">'.$obj->debit.'</td>';
117 117 print '<td align="right">'.$obj->credit.'</td>';
118 118 print '<td align="right">'.$obj->montant.'</td>';
119   - print '<td align="center">'.$obj->sens.'</td>';
120   -
  119 +
121 120 print "</tr>\n";
122 121 $i++;
123 122 }
... ...
accountingex/class/accountancy.class.php
1 1 <?php
2 2 /* Copyright (C) 2005-2012 Christophe Battarel <christophe.battarel@altairis.fr>
3 3 * Copyright (C) 2005-2012 Agnes Rambaud <agnes.rambaud@altairis.fr>
4   - * Copyright (C) 2011-2012 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  4 + * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  5 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
5 6 *
6 7 * This program is free software; you can redistribute it and/or modify
7 8 * it under the terms of the GNU General Public License as published by
... ... @@ -22,7 +23,7 @@
22 23 * \ingroup Accounting Expert
23 24 * \brief Fichier de la classe comptabilité expert
24 25 */
25   -require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  26 +dol_include_once("/core/class/commonobject.class.php");
26 27  
27 28 /**
28 29 * \class Accountancy
... ...
accountingex/class/accountancysystem.class.php
1 1 <?php
2 2 /* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
3   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
4   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  3 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
5 5 *
6 6 * This program is free software; you can redistribute it and/or modify
7 7 * it under the terms of the GNU General Public License as published by
... ...
accountingex/class/accountingaccount.class.php
1 1 <?php
2 2 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  3 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
4 4 * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
5 5 *
6 6 * This program is free software; you can redistribute it and/or modify
... ...
accountingex/class/bookkeeping.class.php
1 1 <?php
2 2 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
4   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  3 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
5 5 *
6 6 * This program is free software; you can redistribute it and/or modify
7 7 * it under the terms of the GNU General Public License as published by
... ...
accountingex/class/chartofaccounts.class.php
1 1 <?php
2 2 /* Copyright (C) 2011-2012 Laurent Destailleur <eldy@users.sourceforge.net>
3   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
4   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  3 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
5 5 *
6 6 * This program is free software; you can redistribute it and/or modify
7 7 * it under the terms of the GNU General Public License as published by
... ...
accountingex/class/fiscalyear.class.php
... ... @@ -21,7 +21,7 @@
21 21 * \ingroup Accounting Expert
22 22 * \brief Fichier de la classe comptabilité expert
23 23 */
24   -require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
  24 +dol_include_once("/core/class/commonobject.class.php");
25 25  
26 26 /**
27 27 * \class Accountancy
... ...
accountingex/class/html.formventilation.class.php
1 1 <?php
2   -/*
3   - * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  2 +/* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
  3 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 5 *
7 6 * This program is free software; you can redistribute it and/or modify
8 7 * it under the terms of the GNU General Public License as published by
... ... @@ -19,7 +18,7 @@
19 18 */
20 19  
21 20 /**
22   - * \file accountingex/class/html.formvenitlation.class.php
  21 + * \file accountingex/class/html.formventilation.class.php
23 22 * \brief Class for HML form
24 23 */
25 24 class FormVentilation extends Form {
... ...
accountingex/core/lib/account.lib.php
1 1 <?php
2   -/* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
3   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  2 +/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  3 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
4 4 *
5 5 * This program is free software; you can redistribute it and/or modify
6 6 * it under the terms of the GNU General Public License as published by
... ... @@ -143,14 +143,21 @@ function length_accountg($account)
143 143 // Clean parameters
144 144 $i = strlen($account);
145 145  
146   - while ($i < $g)
  146 + if ($i >= 2)
147 147 {
148   - $account .= '0';
  148 + while ($i < $g)
  149 + {
  150 + $account .= '0';
  151 +
  152 + $i++;
  153 + }
149 154  
150   - $i++;
  155 + return $account;
  156 + }
  157 + else
  158 + {
  159 + return $account;
151 160 }
152   -
153   - return $account;
154 161 }
155 162 else
156 163 {
... ... @@ -176,14 +183,22 @@ function length_accounta($accounta)
176 183 // Clean parameters
177 184 $i = strlen($accounta);
178 185  
179   - while ($i < $a)
  186 + if ($i >= 2)
180 187 {
181   - $accounta .= '0';
182   -
183   - $i++;
184   - }
  188 + while ($i < $a)
  189 + {
  190 + $accounta .= '0';
  191 +
  192 + $i++;
  193 + }
  194 +
  195 + return $accounta;
185 196  
186   - return $accounta;
  197 + }
  198 + else
  199 + {
  200 + return $accounta;
  201 + }
187 202 }
188 203 else
189 204 {
... ...
accountingex/core/modules/modAccountingExpert.class.php
1 1 <?php
2 2 /* Copyright (C) 2010-2011 Regis Houssin <regis@dolibarr.fr>
3   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
4   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  3 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
5 5 *
6 6 * This program is free software; you can redistribute it and/or modify
7 7 * it under the terms of the GNU General Public License as published by
... ... @@ -23,7 +23,7 @@
23 23 * \brief Module to activate Accounting Expert module
24 24 */
25 25  
26   -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
  26 +dol_include_once("/core/modules/DolibarrModules.class.php");
27 27  
28 28  
29 29 /**
... ... @@ -388,9 +388,9 @@ class modAccountingExpert extends DolibarrModules
388 388 'user'=>0);
389 389 $r++;
390 390  
391   - $this->menu[$r]=array( 'fk_menu'=>'r=17',
  391 + $this->menu[$r]=array( 'fk_menu'=>'r=19',
392 392 'type'=>'left',
393   - 'titre'=>'MenuProductaccount',
  393 + 'titre'=>'MenuTools',
394 394 'mainmenu'=>'accounting',
395 395 'url'=>'/accountingex/admin/productaccount.php',
396 396 'langs'=>'accountingex@accountingex',
... ...
accountingex/css/accountingex.css.php
1 1 <?php
2   -/* Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
3   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  2 +/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  3 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
4 4 *
5 5 * This program is free software; you can redistribute it and/or modify
6 6 * it under the terms of the GNU General Public License as published by
... ...
accountingex/customer/fiche.php
... ... @@ -25,14 +25,16 @@
25 25 * \ingroup Accounting Expert
26 26 * \brief Page fiche ventilation
27 27 */
  28 +
  29 +// Dolibarr environment
28 30 $res=@include("../main.inc.php");
29 31 if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php");
30 32 if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
31 33 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
32 34 if (! $res) die("Include of main fails");
33 35  
34   -
35   -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
  36 +// Class
  37 +dol_include_once("/compta/facture/class/facture.class.php");
36 38  
37 39 $langs->load("bills");
38 40 $langs->load("accountingex@accountingex");
... ...
accountingex/customer/index.php
... ... @@ -2,8 +2,8 @@
2 2 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
4 4 * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
6   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  5 + * Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
  6 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
7 7 *
8 8 * This program is free software; you can redistribute it and/or modify
9 9 * it under the terms of the GNU General Public License as published by
... ... @@ -33,7 +33,7 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
33 33 if (! $res) die("Include of main fails");
34 34  
35 35 // Class
36   -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
  36 +dol_include_once("/core/lib/date.lib.php");
37 37  
38 38 // Langs
39 39 $langs->load("compta");
... ... @@ -60,7 +60,7 @@ else
60 60 $year_start = $year;
61 61 }
62 62  
63   -//ValidateHistory
  63 +// Validate History
64 64 $action=GETPOST('action');
65 65 if ($action == 'validatehistory') {
66 66  
... ...
accountingex/customer/lignes.php
1 1 <?php
2 2 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -33,9 +33,9 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
33 33 if (! $res) die("Include of main fails");
34 34  
35 35 // Class
36   -dol_include_once ( "/accountingex/class/html.formventilation.class.php" );
37   -require_once (DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php");
38   -require_once (DOL_DOCUMENT_ROOT . "/product/class/product.class.php");
  36 +dol_include_once("/accountingex/class/html.formventilation.class.php" );
  37 +dol_include_once("/compta/facture/class/facture.class.php");
  38 +dol_include_once("/product/class/product.class.php");
39 39  
40 40 // langs
41 41 $langs->load ( "bills" );
... ...
accountingex/customer/liste.php
... ... @@ -2,8 +2,8 @@
2 2 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
4 4 * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
5   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
6   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
  5 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  6 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
7 7 *
8 8 * This program is free software; you can redistribute it and/or modify
9 9 * it under the terms of the GNU General Public License as published by
... ... @@ -33,8 +33,8 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
33 33 if (! $res) die("Include of main fails");
34 34  
35 35 // Class
36   -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
37   -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
  36 +dol_include_once("/compta/facture/class/facture.class.php");
  37 +dol_include_once("/product/class/product.class.php");
38 38  
39 39 // Langs
40 40 $langs->load("compta");
... ...
accountingex/journal/bankjournal.php
... ... @@ -6,7 +6,7 @@
6 6 * Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
7 7 * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
8 8 * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
9   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  9 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
10 10 *
11 11 * This program is free software; you can redistribute it and/or modify
12 12 * it under the terms of the GNU General Public License as published by
... ... @@ -35,21 +35,21 @@ if (! $res &amp;&amp; file_exists ( &quot;../../main.inc.php&quot; )) $res = @include (&quot;../../main
35 35 if (! $res && file_exists ( "../../../main.inc.php" )) $res = @include ("../../../main.inc.php");
36 36 if (! $res) die ( "Include of main fails" );
37 37  
38   -
39   -dol_include_once ( "/core/lib/report.lib.php");
40   -dol_include_once ( "/core/lib/date.lib.php");
41   -dol_include_once ( "/core/lib/bank.lib.php");
42   -dol_include_once ( "/accountingex/core/lib/account.lib.php" );
43   -dol_include_once ( "/societe/class/societe.class.php");
44   -dol_include_once ( "/adherents/class/adherent.class.php");
45   -dol_include_once ( "/compta/sociales/class/chargesociales.class.php");
46   -dol_include_once ( "/compta/paiement/class/paiement.class.php");
47   -dol_include_once ( "/compta/tva/class/tva.class.php");
48   -dol_include_once ( "/fourn/class/paiementfourn.class.php");
49   -dol_include_once ( "/fourn/class/fournisseur.facture.class.php");
50   -dol_include_once ( "/fourn/class/fournisseur.class.php");
51   -dol_include_once ( "/accountingex/class/bookkeeping.class.php");
52   -dol_include_once ( "/societe/class/client.class.php");
  38 +// Class
  39 +dol_include_once("/core/lib/report.lib.php");
  40 +dol_include_once("/core/lib/date.lib.php");
  41 +dol_include_once("/core/lib/bank.lib.php");
  42 +dol_include_once("/accountingex/core/lib/account.lib.php");
  43 +dol_include_once("/societe/class/societe.class.php");
  44 +dol_include_once("/adherents/class/adherent.class.php");
  45 +dol_include_once("/compta/sociales/class/chargesociales.class.php");
  46 +dol_include_once("/compta/paiement/class/paiement.class.php");
  47 +dol_include_once("/compta/tva/class/tva.class.php");
  48 +dol_include_once("/fourn/class/paiementfourn.class.php");
  49 +dol_include_once("/fourn/class/fournisseur.facture.class.php");
  50 +dol_include_once("/fourn/class/fournisseur.class.php");
  51 +dol_include_once("/accountingex/class/bookkeeping.class.php");
  52 +dol_include_once("/societe/class/client.class.php");
53 53  
54 54 // Langs
55 55 $langs->load("companies");
... ...
accountingex/journal/cashjournal.php
... ... @@ -6,7 +6,7 @@
6 6 * Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
7 7 * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
8 8 * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
9   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  9 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
10 10 *
11 11 * This program is free software; you can redistribute it and/or modify
12 12 * it under the terms of the GNU General Public License as published by
... ... @@ -35,20 +35,20 @@ if (! $res &amp;&amp; file_exists ( &quot;../../main.inc.php&quot; )) $res = @include (&quot;../../main
35 35 if (! $res && file_exists ( "../../../main.inc.php" )) $res = @include ("../../../main.inc.php");
36 36 if (! $res) die ( "Include of main fails" );
37 37  
38   -
39   -dol_include_once ( "/core/lib/report.lib.php");
40   -dol_include_once ( "/core/lib/date.lib.php");
41   -dol_include_once ( "/core/lib/bank.lib.php");
42   -dol_include_once ( "/accountingex/core/lib/account.lib.php" );
43   -dol_include_once ( "/societe/class/societe.class.php");
44   -dol_include_once ( "/adherents/class/adherent.class.php");
45   -dol_include_once ( "/compta/sociales/class/chargesociales.class.php");
46   -dol_include_once ( "/compta/paiement/class/paiement.class.php");
47   -dol_include_once ( "/compta/tva/class/tva.class.php");
48   -dol_include_once ( "/fourn/class/paiementfourn.class.php");
49   -dol_include_once ( "/fourn/class/fournisseur.facture.class.php");
50   -dol_include_once ( "/fourn/class/fournisseur.class.php");
51   -dol_include_once ( "/accountingex/class/bookkeeping.class.php");
  38 +// Class
  39 +dol_include_once("/core/lib/report.lib.php");
  40 +dol_include_once("/core/lib/date.lib.php");
  41 +dol_include_once("/core/lib/bank.lib.php");
  42 +dol_include_once("/accountingex/core/lib/account.lib.php");
  43 +dol_include_once("/societe/class/societe.class.php");
  44 +dol_include_once("/adherents/class/adherent.class.php");
  45 +dol_include_once("/compta/sociales/class/chargesociales.class.php");
  46 +dol_include_once("/compta/paiement/class/paiement.class.php");
  47 +dol_include_once("/compta/tva/class/tva.class.php");
  48 +dol_include_once("/fourn/class/paiementfourn.class.php");
  49 +dol_include_once("/fourn/class/fournisseur.facture.class.php");
  50 +dol_include_once("/fourn/class/fournisseur.class.php");
  51 +dol_include_once("/accountingex/class/bookkeeping.class.php");
52 52  
53 53 // Langs
54 54 $langs->load("companies");
... ...
accountingex/journal/index.php
1 1 <?php
2   -/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net>
3   - * Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  2 +/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  3 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
6 4 *
7 5 * This program is free software; you can redistribute it and/or modify
8 6 * it under the terms of the GNU General Public License as published by
... ... @@ -32,7 +30,6 @@ if (! $res &amp;&amp; file_exists(&quot;../../main.inc.php&quot;)) $res=@include(&quot;../../main.inc.p
32 30 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
33 31 if (! $res) die("Include of main fails");
34 32  
35   -
36 33 // Langs
37 34 $langs->load("compta");
38 35 $langs->load("bills");
... ...
accountingex/journal/purchasesjournal.php
... ... @@ -33,14 +33,14 @@ if (! $res &amp;&amp; file_exists(&quot;../../main.inc.php&quot;)) $res=@include(&quot;../../main.inc.p
33 33 if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php");
34 34 if (! $res) die("Include of main fails");
35 35  
36   -
37   -dol_include_once ( "/core/lib/report.lib.php");
38   -dol_include_once ( "/core/lib/date.lib.php");
39   -dol_include_once ( "/accountingex/core/lib/account.lib.php" );
40   -dol_include_once ( "/fourn/class/fournisseur.facture.class.php");
41   -dol_include_once ( "/fourn/class/fournisseur.class.php");
42   -dol_include_once ( "/accountingex/class/bookkeeping.class.php");
43   -dol_include_once ( "/accountingex/class/accountingaccount.class.php" );
  36 +// Class
  37 +dol_include_once("/core/lib/report.lib.php");
  38 +dol_include_once("/core/lib/date.lib.php");
  39 +dol_include_once("/accountingex/core/lib/account.lib.php");
  40 +dol_include_once("/fourn/class/fournisseur.facture.class.php");
  41 +dol_include_once("/fourn/class/fournisseur.class.php");
  42 +dol_include_once("/accountingex/class/bookkeeping.class.php");
  43 +dol_include_once("/accountingex/class/accountingaccount.class.php");
44 44  
45 45 // Langs
46 46 $langs->load("compta");
... ...
accountingex/journal/sellsjournal.php
... ... @@ -6,7 +6,7 @@
6 6 * Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
7 7 * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
8 8 * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
9   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  9 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
10 10 *
11 11 * This program is free software; you can redistribute it and/or modify
12 12 * it under the terms of the GNU General Public License as published by
... ... @@ -36,13 +36,13 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
36 36 if (! $res) die("Include of main fails");
37 37  
38 38 // Class
39   -dol_include_once ( "/core/lib/report.lib.php");
40   -dol_include_once ( "/core/lib/date.lib.php");
41   -dol_include_once ( "/accountingex/core/lib/account.lib.php" );
42   -dol_include_once ( "/compta/facture/class/facture.class.php");
43   -dol_include_once ( "/societe/class/client.class.php");
44   -dol_include_once ( "/accountingex/class/bookkeeping.class.php");
45   -dol_include_once ( "/accountingex/class/accountingaccount.class.php" );
  39 +dol_include_once("/core/lib/report.lib.php");
  40 +dol_include_once("/core/lib/date.lib.php");
  41 +dol_include_once("/accountingex/core/lib/account.lib.php");
  42 +dol_include_once("/compta/facture/class/facture.class.php");
  43 +dol_include_once("/societe/class/client.class.php");
  44 +dol_include_once("/accountingex/class/bookkeeping.class.php");
  45 +dol_include_once("/accountingex/class/accountingaccount.class.php");
46 46  
47 47 // Langs
48 48 $langs->load("compta");
... ...
accountingex/sql/llx_accountingaccount.update.sql
1 1 -- ============================================================================
2   --- Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
3   --- Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  2 +-- Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  3 +-- Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
4 4 --
5 5 -- This program is free software; you can redistribute it and/or modify
6 6 -- it under the terms of the GNU General Public License as published by
... ...
accountingex/sql/llx_accountingfiscalyear.sql
1 1 -- ============================================================================
2   --- Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  2 +-- Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  3 +-- Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
3 4 --
4 5 -- This program is free software; you can redistribute it and/or modify
5 6 -- it under the terms of the GNU General Public License as published by
... ...
accountingex/sql/llx_bookkeeping.sql
1 1 -- ============================================================================
2   --- Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  2 +-- Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  3 +-- Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
3 4 --
4 5 -- This program is free software; you can redistribute it and/or modify
5 6 -- it under the terms of the GNU General Public License as published by
... ...
accountingex/supplier/fiche.php
1 1 <?php
2 2 /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
4   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
5   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
  4 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  5 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -31,7 +31,7 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
31 31 if (! $res) die("Include of main fails");
32 32  
33 33 // Class
34   -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
  34 +dol_include_once("/fourn/class/fournisseur.facture.class.php");
35 35  
36 36 // Langs
37 37 $langs->load("compta");
... ...
accountingex/supplier/index.php
... ... @@ -3,8 +3,8 @@
3 3 * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
4 4 * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
5 5 * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
6   - * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
7   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@gmail.com>
  6 + * Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
  7 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
8 8 *
9 9 * This program is free software; you can redistribute it and/or modify
10 10 * it under the terms of the GNU General Public License as published by
... ... @@ -35,7 +35,7 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
35 35 if (! $res) die("Include of main fails");
36 36  
37 37 // Class
38   -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
  38 +dol_include_once("/core/lib/date.lib.php");
39 39  
40 40 // Langs
41 41 $langs->load("compta");
... ...
accountingex/supplier/lignes.php
1 1 <?php
2 2 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
4   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
5   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
  4 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  5 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
6 6 *
7 7 * This program is free software; you can redistribute it and/or modify
8 8 * it under the terms of the GNU General Public License as published by
... ... @@ -33,10 +33,10 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
33 33 if (! $res) die("Include of main fails");
34 34  
35 35 // Class
36   -dol_include_once ( "/accountingex/class/html.formventilation.class.php" );
37   -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
38   -require_once (DOL_DOCUMENT_ROOT . "/product/class/product.class.php");
39   -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
  36 +dol_include_once("/accountingex/class/html.formventilation.class.php");
  37 +dol_include_once("/fourn/class/fournisseur.facture.class.php");
  38 +dol_include_once("/product/class/product.class.php");
  39 +dol_include_once("/core/lib/date.lib.php");
40 40  
41 41 // Langs
42 42 $langs->load("compta");
... ...
accountingex/supplier/liste.php
... ... @@ -2,8 +2,8 @@
2 2 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
3 3 * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
4 4 * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
5   - * Copyright (C) 2013 Olivier Geffroy <jeff@jeffinfo.com>
6   - * Copyright (C) 2013 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
  5 + * Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
  6 + * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@fidurex.fr>
7 7 *
8 8 * This program is free software; you can redistribute it and/or modify
9 9 * it under the terms of the GNU General Public License as published by
... ... @@ -35,8 +35,8 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;)) $res=@include(&quot;../../../main
35 35 if (! $res) die("Include of main fails");
36 36  
37 37 // Class
38   -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
39   -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php");
  38 +dol_include_once("/fourn/class/fournisseur.facture.class.php");
  39 +dol_include_once("/fourn/class/fournisseur.product.class.php");
40 40  
41 41 // Langs
42 42 $langs->load("compta");
... ... @@ -209,15 +209,14 @@ if ($result)
209 209 print $objp->code_buy;
210 210 print '</td>';
211 211  
212   - //Colonne choix du compte
213   - print '<td align="center">';
214   - print $form->selectarray("codeventil[]",$cgs, $cgn[$objp->code_buy]);
215   - print '</td>';
216   - //Colonne choix ligne a ventiler
217   - print '<td align="center">';
218   - print '<input type="checkbox" name="mesCasesCochees[]" value="'.$objp->rowid."_".$i.'"'.($objp->code_buy?"checked":"").'/>';
219   - print '</td>';
220   -
  212 + //Colonne choix du compte
  213 + print '<td align="center">';
  214 + print $form->selectarray("codeventil[]",$cgs, $cgn[$objp->code_buy]);
  215 + print '</td>';
  216 + //Colonne choix ligne a ventiler
  217 + print '<td align="center">';
  218 + print '<input type="checkbox" name="mesCasesCochees[]" value="'.$objp->rowid."_".$i.'"'.($objp->code_buy?"checked":"").'/>';
  219 + print '</td>';
221 220  
222 221 print "</tr>";
223 222 $i++;
... ...