## CREDITS
diff --git a/README.md b/README.md
index 3d9ba75f1f5..b68e8b65558 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
-## FUTURE
+## WHAT DOLIBARR CAN'T DO YET
These are features that Dolibarr does **not** yet fully support:
@@ -179,7 +179,8 @@ Administrator, user, developer and translator's documentations are available alo
## CONTRIBUTING
-See [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md) file
+This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
+
## CREDITS
@@ -199,3 +200,8 @@ Follow Dolibarr project on:
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)
+
+
+### Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 7dcb8c738bd..2d4668b447c 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -28,9 +28,9 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
SourceDir=..\..\..
AppId=doliwamp
AppPublisher=NLTechno
-AppPublisherURL=http://www.nltechno.com
-AppSupportURL=http://www.dolibarr.org
-AppUpdatesURL=http://www.dolibarr.org
+AppPublisherURL=https://www.nltechno.com
+AppSupportURL=https://www.dolibarr.org
+AppUpdatesURL=https://www.dolibarr.org
AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
AppCopyright=Copyright (C) 2008-2017 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
DefaultDirName=c:\dolibarr
@@ -100,9 +100,9 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
; PhpMyAdmin, Apache, Php, Mysql
; Put here path of Wampserver applications
-; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
+; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
-; Value ???: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+; Value OK: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 5f71ff54072..ec9ded557ff 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
exit;
}
-require_once($path."../htdocs/master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once $path."../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
/*
@@ -47,7 +47,7 @@ $includeconstants=array();
if (empty($argv[1]))
{
- print "Usage: ".$script_file." release=auto|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
exit -1;
}
@@ -70,30 +70,52 @@ while ($i < $argc)
$i++;
}
+if (empty($release))
+{
+ print "Error: Missing release paramater\n";
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+ exit -1;
+}
+
+$savrelease = $release;
+
// If release is auto, we take current version
$tmpver=explode('-', $release, 2);
-if ($tmpver[0] == 'auto')
+if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
{
$release=DOL_VERSION;
- if ($tmpver[1]) $release.='-'.$tmpver[1];
+ if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
}
if (empty($includecustom))
{
- $tmpver=explode('-', $release, 2);
- if (DOL_VERSION != $tmpver[0])
- {
- print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpver[0].')'."\n";
- print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
- exit -1;
- }
+ $tmpverbis=explode('-', $release, 2);
+ if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable')
+ {
+ if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
+ {
+ print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+ exit -1;
+ }
+ }
+ else
+ {
+ $tmpverter=explode('-', DOL_VERSION, 2);
+ if ($tmpverter[0] != $tmpverbis[0])
+ {
+ print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+ exit -1;
+ }
+ }
}
else
{
if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
{
- print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
- print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
+ print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+ print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
exit -1;
}
}
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 08d02e8b2b8..589e2a3f55c 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,7 +1,7 @@
#----------------------------------------------------------------------------
# \file dolibarr.pl
# \brief Dolibarr script install for Virtualmin Pro
-# \author (c)2009-2017 Regis Houssin '; print '
'; @@ -276,7 +277,7 @@ if ($resql) if (! empty($arrayfields['aa.pcg_type']['checked'])) print '
'; - +// End of page llxFooter(); $db->close(); @@ -1042,7 +1024,6 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='') global $form; global $region_id; global $elementList,$sourceList; - global $bc; $formadmin = new FormAdmin($db); $formcompany = new FormCompany($db); @@ -1142,16 +1123,11 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='') } elseif (in_array($fieldlist[$field], array('content'))) { - if ($tabname == MAIN_DB_PREFIX.'c_email_templates') - { - print '
| ' . $langs->trans("AccountingCategory") . ' | '; print ''; $formaccounting->select_accounting_category($cat_id, 'account_category', 1, 0, 0, 1); print ''; print ' |
'; - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php index c4b31c0f169..8cd45c1cfda 100644 --- a/htdocs/accountancy/admin/defaultaccounts.php +++ b/htdocs/accountancy/admin/defaultaccounts.php @@ -34,12 +34,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; -$langs->load("compta"); -$langs->load("bills"); -$langs->load("admin"); -$langs->load("accountancy"); -$langs->load("salaries"); -$langs->load("loan"); +// Load translation files required by the page +$langs->loadLangs(array("compta","bills","admin","accountancy","salaries","loan")); // Security check if (empty($user->rights->accounting->chartofaccount)) @@ -194,5 +190,6 @@ print '
load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
+// Load translation files required by the page
+$langs->loadLangs(array("compta","bills","admin","accountancy"));
// Security access
if (empty($user->rights->accounting->chartofaccount))
@@ -281,5 +278,6 @@ print '';
@@ -186,5 +181,6 @@ if ($result) {
print $db->error();
}
+// End of page
llxFooter();
$db->close();
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 44c816530dd..a17ee45ae4d 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -1,7 +1,7 @@
* Copyright (C) 2013-2014 Florian Henry
- * Copyright (C) 2013-2017 Alexandre Spangaro
+ * Copyright (C) 2013-2018 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2014 Marcos García
* Copyright (C) 2014 Juanjo Menent
@@ -32,10 +32,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("admin");
-$langs->load("accountancy");
+// Load translation files required by the page
+$langs->loadLangs(array("compta","bills","admin","accountancy"));
// Security access
if (empty($user->rights->accounting->chartofaccount))
@@ -134,6 +132,18 @@ if ($action == 'setdisabledirectinput') {
}
}
+if ($action == 'setenabledraftexport') {
+ $setenabledraftexport = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL", $setenabledraftexport, 'yesno', 0, '', $conf->entity);
+ if (! $res > 0)
+ $error ++;
+ if (! $error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
+}
+
/*
* View
*/
@@ -215,6 +225,19 @@ if (! empty($user->admin))
}
print ' ';
+ print '';
+ print '' . $langs->trans("ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL") . ' ';
+ if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
+ print '';
+ print img_picto($langs->trans("Activated"), 'switch_on');
+ print ' ';
+ } else {
+ print '';
+ print img_picto($langs->trans("Disabled"), 'switch_off');
+ print ' ';
+ }
+ print ' ';
+
print '';
print '' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . ' ';
if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
@@ -272,5 +295,6 @@ print '
'; print '
'; print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index f2f862a9cdd..7e8532e5225 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -21,6 +21,7 @@ * \ingroup Advanced accountancy * \brief Setup page to configure journals */ + require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; @@ -30,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; +// Load translation files required by the page $langs->loadLangs(array("admin","compta","accountancy")); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; @@ -133,6 +135,7 @@ $elementList = array(); '3' => $langs->trans('AccountingJournalType3'), '4' => $langs->trans('AccountingJournalType4'), '5' => $langs->trans('AccountingJournalType5'), + '8' => $langs->trans('AccountingJournalType8'), '9' => $langs->trans('AccountingJournalType9') ); @@ -416,7 +419,6 @@ if ($id) if ($tabname[$id]) { $alabelisused=0; - $var=false; $fieldlist=explode(',',$tabfield[$id]); @@ -496,7 +498,6 @@ if ($id) { $num = $db->num_rows($resql); $i = 0; - $var=true; $param = '&id='.$id; if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id; @@ -601,6 +602,7 @@ if ($id) if (empty($reshook)) { + $langs->load("accountancy"); foreach ($fieldlist as $field => $value) { @@ -611,10 +613,12 @@ if ($id) $valuetoshow=$langs->trans('All'); } else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') { - $langs->load("accountancy"); $key=$langs->trans("AccountingJournalType".strtoupper($obj->nature)); - $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]}); + $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature))?$key:$obj->{$fieldlist[$field]}); } + else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') { + $valuetoshow=$langs->trans($obj->label); + } $class='tddict'; // Show value for field @@ -640,13 +644,7 @@ if ($id) // Active print '';
if ($canbedisabled) print ''.$actl[$obj->active].'';
- else
- {
- if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
- else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
- else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
- else print $langs->trans("AlwaysActive");
- }
+ else print $langs->trans("AlwaysActive");
print " ";
// Modify link
@@ -685,7 +683,7 @@ if ($id)
print '
'; - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index e07d0c24771..2467b89b108 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -26,7 +26,6 @@ */ require '../../main.inc.php'; -// Class require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; @@ -35,12 +34,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php'; require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; -// Langs -$langs->load("companies"); -$langs->load("compta"); -$langs->load("main"); -$langs->load("accountancy"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array("companies","compta","accountancy","products")); // Security check if (empty($conf->accounting->enabled)) { @@ -261,7 +256,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $result = $db->query($sql); $nbtotalofrecords = $db->num_rows($result); + if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0 + { + $page = 0; + $offset = 0; + } } + $sql .= $db->plimit($limit + 1, $offset); dol_syslog("/accountancy/admin/productaccount.php:: sql=" . $sql, LOG_DEBUG); @@ -272,8 +273,8 @@ if ($result) $i = 0; $param=''; - if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; - if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; + if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage); + if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit); if ($search_ref > 0) $param.="&search_desc=".urlencode($search_ref); if ($search_label > 0) $param.="&search_desc=".urlencode($search_label); if ($search_desc > 0) $param.="&search_desc=".urlencode($search_desc); @@ -300,10 +301,10 @@ if ($result) print ' ';
print '' . $langs->trans('Options') . ' ' . $langs->trans('Description') . ' ';
print " \n";
- print ' ' . $langs->trans('OptionModeProductSell') . ' ';
+ print ' ' . $langs->trans('OptionModeProductSell') . ' ';
print ''.$langs->trans('OptionModeProductSellDesc');
print " ' . $langs->trans('OptionModeProductBuy') . ' ';
+ print ' ' . $langs->trans('OptionModeProductBuy') . ' ';
print ''.$langs->trans('OptionModeProductBuyDesc')." ';
print '';
@@ -348,11 +349,9 @@ if ($result)
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="center"', $sortfield, $sortorder);
- if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
- $fieldtosortaccount="p.accountancy_code_buy";
- }
+ if ($accounting_product_mode == 'ACCOUNTANCY_SELL') print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="center"', $sortfield, $sortorder);
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="center"', $sortfield, $sortorder);
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') $fieldtosortaccount="p.accountancy_code_buy";
else $fieldtosortaccount="p.accountancy_code_sell";
print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("AssignDedicatedAccountingAccount");
@@ -362,7 +361,6 @@ if ($result)
$product_static = new Product($db);
- $var = true;
$i=0;
while ($i < min($num,$limit))
{
@@ -410,9 +408,11 @@ if ($result)
print ' ' . nl2br(dol_trunc($obj->description, $trunclengh)) . ' ';
}
- print ''.$product_static->getLibStatut(3, 0).' ';
+ if ($accounting_product_mode == 'ACCOUNTANCY_SELL')
+ print ''.$product_static->getLibStatut(3, 0).' ';
- print ''.$product_static->getLibStatut(3, 1).' ';
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY')
+ print ''.$product_static->getLibStatut(3, 1).' ';
// Current accounting account
print '';
@@ -495,5 +495,6 @@ if ($result)
dol_print_error($db);
}
+// End of page
llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 15e7acd7deb..b8ab8d9af9f 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
- * Copyright (C) 2016 Florian Henry
- * Copyright (C) 2016-2017 Alexandre Spangaro
+/* Copyright (C) 2016 Olivier Geffroy
+ * Copyright (C) 2016 Florian Henry
+ * Copyright (C) 2016-2018 Alexandre Spangaro
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,12 +34,12 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-// Langs
-$langs->load("accountancy");
+// Load translation files required by the page
+$langs->loadLangs(array("accountancy"));
$page = GETPOST("page");
-$sortorder = GETPOST("sortorder");
-$sortfield = GETPOST("sortfield");
+$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST("sortfield", 'alpha');
$action = GETPOST('action', 'alpha');
$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
$search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
@@ -53,7 +53,7 @@ if ($search_accountancy_code_end == - 1) {
$search_accountancy_code_end = '';
}
-if (GETPOST("exportcsv")) $action = 'export_csv';
+if (GETPOST("exportcsv",'alpha')) $action = 'export_csv';
$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
@@ -138,8 +138,7 @@ if ($action == 'export_csv') {
$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
- $journal = 'balance';
-
+ $filename = 'balance';
include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
$result = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
@@ -153,7 +152,6 @@ if ($action == 'export_csv') {
print $object->get_compte_desc($line->numero_compte) . $sep;
print price($line->debit) . $sep;
print price($line->credit) . $sep;
- print price($line->debit) . $sep;
print price($line->credit - $line->debit) . $sep;
print "\n";
}
@@ -189,7 +187,7 @@ else {
print '';
$button = 'global->ACCOUNTING_EXPORT_FORMAT.')" />';
- print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);
+ print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, $button, $result, $result, 'title_accountancy', 0);
$moreforfilter = '';
@@ -254,8 +252,8 @@ else {
print '';
// Permet d'afficher le compte comptable
- if ($root_account_description != $displayed_account) {
-
+ if (empty($displayed_account) || $root_account_description != $displayed_account)
+ {
// Affiche un Sous-Total par compte comptable
if ($displayed_account != "") {
print ' ' . $langs->trans("SubTotal") . ': ' . price($sous_total_debit) . ' ' . price($sous_total_credit) . ' ' . price($sous_total_credit - $sous_total_debit) . ' ';
@@ -263,9 +261,9 @@ else {
print '";
- print '' . $root_account_description . ' ';
+ print '' . $line->numero_compte . ($root_account_description ? ' - ' . $root_account_description : '') . ' ';
print ' ';
$displayed_account = $root_account_description;
@@ -300,7 +298,8 @@ else {
print "";
print '';
- llxFooter();
}
+// End of page
+llxFooter();
$db->close();
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index 1d746b4d4df..3a0a1f73308 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -26,16 +26,11 @@
*/
require '../../main.inc.php';
-// Class
require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-// Langs
-$langs->load("main");
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("accountancy");
+// Load translation files required by the page
+$langs->loadLangs(array("bills","compta","accountancy","other"));
// Filter
$year = GETPOST("year",'int');
@@ -75,10 +70,23 @@ if ($result) {
$y = $year_current;
-$var = true;
-
print '';
-print '
\n";
+// End of page
llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 9dcb924779e..e17cefd77bb 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,8 +1,8 @@
- * Copyright (C) 2013-2017 Florian Henry
- * Copyright (C) 2013-2017 Alexandre Spangaro
- * Copyright (C) 2017 Laurent Destailleur
+/* Copyright (C) 2013-2017 Olivier Geffroy
+ * Copyright (C) 2013-2017 Florian Henry
+ * Copyright (C) 2013-2018 Alexandre Spangaro
+ * Copyright (C) 2017 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,9 +32,8 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-$langs->load("accountancy");
-$langs->load("bills");
-$langs->load("compta");
+// Load translation files required by the page
+$langs->loadLangs(array("accountancy", "bills", "compta"));
$action = GETPOST('action','aZ09');
@@ -89,36 +88,36 @@ if ($action == "confirm_update") {
if (! $error)
{
- $book = new BookKeeping($db);
+ $object = new BookKeeping($db);
- $result = $book->fetch($id, null, $mode);
+ $result = $object->fetch($id, null, $mode);
if ($result < 0) {
$error++;
- setEventMessages($book->error, $book->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
} else {
- $book->numero_compte = $account_number;
- $book->subledger_account = $subledger_account;
- $book->label_compte = $label_compte;
- $book->label_operation= $label_operation;
- $book->debit = $debit;
- $book->credit = $credit;
+ $object->numero_compte = $account_number;
+ $object->subledger_account = $subledger_account;
+ $object->label_compte = $label_compte;
+ $object->label_operation= $label_operation;
+ $object->debit = $debit;
+ $object->credit = $credit;
if (floatval($debit) != 0.0) {
- $book->montant = $debit;
- $book->sens = 'D';
+ $object->montant = $debit;
+ $object->sens = 'D';
}
if (floatval($credit) != 0.0) {
- $book->montant = $credit;
- $book->sens = 'C';
+ $object->montant = $credit;
+ $object->sens = 'C';
}
- $result = $book->update($user, false, $mode);
+ $result = $object->update($user, false, $mode);
if ($result < 0) {
- setEventMessages($book->error, $book->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
} else {
if ($mode != '_tmp')
{
- setEventMessages($langs->trans('Saved'), null, 'mesgs');
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
}
$debit = 0;
@@ -147,39 +146,39 @@ else if ($action == "add") {
}
if (! $error) {
- $book = new BookKeeping($db);
+ $object = new BookKeeping($db);
- $book->numero_compte = $account_number;
- $book->subledger_account = $subledger_account;
- $book->label_compte = $label_compte;
- $book->label_operation= $label_operation;
- $book->debit = $debit;
- $book->credit = $credit;
- $book->doc_date = GETPOST('doc_date','alpha');
- $book->doc_type = GETPOST('doc_type','alpha');
- $book->piece_num = $piece_num;
- $book->doc_ref = GETPOST('doc_ref','alpha');
- $book->code_journal = GETPOST('code_journal','alpha');
- $book->fk_doc = GETPOST('fk_doc','alpha');
- $book->fk_docdet = GETPOST('fk_docdet','alpha');
+ $object->numero_compte = $account_number;
+ $object->subledger_account = $subledger_account;
+ $object->label_compte = $label_compte;
+ $object->label_operation= $label_operation;
+ $object->debit = $debit;
+ $object->credit = $credit;
+ $object->doc_date = GETPOST('doc_date','alpha');
+ $object->doc_type = GETPOST('doc_type','alpha');
+ $object->piece_num = $piece_num;
+ $object->doc_ref = GETPOST('doc_ref','alpha');
+ $object->code_journal = GETPOST('code_journal','alpha');
+ $object->fk_doc = GETPOST('fk_doc','alpha');
+ $object->fk_docdet = GETPOST('fk_docdet','alpha');
if (floatval($debit) != 0.0) {
- $book->montant = $debit;
- $book->sens = 'D';
+ $object->montant = $debit;
+ $object->sens = 'D';
}
if (floatval($credit) != 0.0) {
- $book->montant = $credit;
- $book->sens = 'C';
+ $object->montant = $credit;
+ $object->sens = 'C';
}
- $result = $book->createStd($user, false, $mode);
+ $result = $object->createStd($user, false, $mode);
if ($result < 0) {
- setEventMessages($book->error, $book->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
} else {
if ($mode != '_tmp')
{
- setEventMessages($langs->trans('Saved'), null, 'mesgs');
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
}
$debit = 0;
@@ -191,17 +190,17 @@ else if ($action == "add") {
}
else if ($action == "confirm_delete") {
- $book = new BookKeeping($db);
+ $object = new BookKeeping($db);
- $result = $book->fetch($id, null, $mode);
- $piece_num = $book->piece_num;
+ $result = $object->fetch($id, null, $mode);
+ $piece_num = $object->piece_num;
if ($result < 0) {
- setEventMessages($book->error, $book->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
} else {
- $result = $book->delete($user, false, $mode);
+ $result = $object->delete($user, false, $mode);
if ($result < 0) {
- setEventMessages($book->error, $book->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
}
}
$action = '';
@@ -210,7 +209,7 @@ else if ($action == "confirm_delete") {
else if ($action == "confirm_create") {
$error = 0;
- $book = new BookKeeping($db);
+ $object = new BookKeeping($db);
if (! GETPOST('code_journal','alpha') || GETPOST('code_journal','alpha') == '-1') {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Journal")), null, 'errors');
@@ -225,29 +224,29 @@ else if ($action == "confirm_create") {
if (! $error)
{
- $book->label_compte = '';
- $book->debit = 0;
- $book->credit = 0;
- $book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth','int'), GETPOST('doc_dateday','int'), GETPOST('doc_dateyear','int'));
- $book->doc_type = GETPOST('doc_type','alpha');
- $book->piece_num = GETPOST('next_num_mvt','alpha');
- $book->doc_ref = GETPOST('doc_ref','alpha');
- $book->code_journal = GETPOST('code_journal','alpha');
- $book->fk_doc = 0;
- $book->fk_docdet = 0;
- $book->montant = 0;
+ $object->label_compte = '';
+ $object->debit = 0;
+ $object->credit = 0;
+ $object->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth','int'), GETPOST('doc_dateday','int'), GETPOST('doc_dateyear','int'));
+ $object->doc_type = GETPOST('doc_type','alpha');
+ $object->piece_num = GETPOST('next_num_mvt','alpha');
+ $object->doc_ref = GETPOST('doc_ref','alpha');
+ $object->code_journal = GETPOST('code_journal','alpha');
+ $object->fk_doc = 0;
+ $object->fk_docdet = 0;
+ $object->montant = 0;
- $result = $book->createStd($user,0, $mode);
+ $result = $object->createStd($user,0, $mode);
if ($result < 0) {
- setEventMessages($book->error, $book->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
} else {
if ($mode != '_tmp')
{
- setEventMessages($langs->trans('Saved'), null, 'mesgs');
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
}
$action = 'update';
- $id=$book->id;
- $piece_num = $book->piece_num;
+ $id=$object->id;
+ $piece_num = $object->piece_num;
}
}
}
@@ -260,7 +259,7 @@ if ($action == 'setdate') {
} else {
if ($mode != '_tmp')
{
- setEventMessages($langs->trans('Saved'), null, 'mesgs');
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
}
$action = '';
}
@@ -274,7 +273,7 @@ if ($action == 'setjournal') {
} else {
if ($mode != '_tmp')
{
- setEventMessages($langs->trans('Saved'), null, 'mesgs');
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
}
$action = '';
}
@@ -288,7 +287,7 @@ if ($action == 'setdocref') {
} else {
if ($mode != '_tmp')
{
- setEventMessages($langs->trans('Saved'), null, 'mesgs');
+ setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
}
$action = '';
}
@@ -326,8 +325,8 @@ if ($action == 'create')
{
print load_fiche_titre($langs->trans("CreateMvts"));
- $book = new BookKeeping($db);
- $next_num_mvt = $book->getNextNumMvt('_tmp');
+ $object = new BookKeeping($db);
+ $next_num_mvt = $object->getNextNumMvt('_tmp');
if (empty($next_num_mvt))
{
@@ -361,7 +360,7 @@ if ($action == 'create')
print '
load("admin");
-$langs->load("compta");
+// Load translation files required by the page
+$langs->loadLangs(array("admin","compta"));
// Security check
if ($user->societe_id > 0)
@@ -95,6 +95,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
$result = $db->query($sql);
$nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit+1, $offset);
@@ -151,6 +156,6 @@ if ($result)
dol_print_error($db);
}
-
+// End of page
llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 78c6510469b..389b835e38e 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -26,8 +26,8 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
-$langs->load("admin");
-$langs->load("compta");
+// Load translation files required by the page
+$langs->loadLangs(array("admin","compta"));
// Security check
if ($user->societe_id > 0)
@@ -318,5 +318,6 @@ if ($action == 'create')
}
}
+// End of page
llxFooter();
$db->close();
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index baadbdc0828..3141a624194 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -26,8 +26,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
-$langs->load("admin");
-$langs->load("compta");
+// Load translation files required by the page
+$langs->loadLangs(array("admin","compta"));
// Security check
if ($user->societe_id > 0)
@@ -58,5 +58,6 @@ if ($id) {
print '
';
}
+// End of page
llxFooter();
$db->close();
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 93d41b3cbc6..8f6090d7c8f 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -24,16 +24,12 @@
*/
require '../../main.inc.php';
-// Class
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-// langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("main");
-$langs->load("accountancy");
+// Load translation files required by the page
+$langs->loadLangs(array("compta","bills","accountancy"));
// Security check
if (! $user->admin)
@@ -141,7 +137,6 @@ if ($result) {
$form = new Form($db);
$formaccounting = new FormAccounting($db);
- $var = true;
while ( $i < min($num_lines, $limit) ) {
$objp = $db->fetch_object($result);
print ''; print '
'; print ''; +// End of page llxFooter(); $db->close(); diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index f2f862a9cdd..7e8532e5225 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -21,6 +21,7 @@ * \ingroup Advanced accountancy * \brief Setup page to configure journals */ + require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; @@ -30,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; +// Load translation files required by the page $langs->loadLangs(array("admin","compta","accountancy")); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; @@ -133,6 +135,7 @@ $elementList = array(); '3' => $langs->trans('AccountingJournalType3'), '4' => $langs->trans('AccountingJournalType4'), '5' => $langs->trans('AccountingJournalType5'), + '8' => $langs->trans('AccountingJournalType8'), '9' => $langs->trans('AccountingJournalType9') ); @@ -416,7 +419,6 @@ if ($id) if ($tabname[$id]) { $alabelisused=0; - $var=false; $fieldlist=explode(',',$tabfield[$id]); @@ -496,7 +498,6 @@ if ($id) { $num = $db->num_rows($resql); $i = 0; - $var=true; $param = '&id='.$id; if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id; @@ -601,6 +602,7 @@ if ($id) if (empty($reshook)) { + $langs->load("accountancy"); foreach ($fieldlist as $field => $value) { @@ -611,10 +613,12 @@ if ($id) $valuetoshow=$langs->trans('All'); } else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') { - $langs->load("accountancy"); $key=$langs->trans("AccountingJournalType".strtoupper($obj->nature)); - $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]}); + $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature))?$key:$obj->{$fieldlist[$field]}); } + else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') { + $valuetoshow=$langs->trans($obj->label); + } $class='tddict'; // Show value for field @@ -640,13 +644,7 @@ if ($id) // Active print '
'; - +// End of page llxFooter(); $db->close(); diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index e07d0c24771..2467b89b108 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -26,7 +26,6 @@ */ require '../../main.inc.php'; -// Class require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; @@ -35,12 +34,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php'; require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; -// Langs -$langs->load("companies"); -$langs->load("compta"); -$langs->load("main"); -$langs->load("accountancy"); -$langs->load("products"); +// Load translation files required by the page +$langs->loadLangs(array("companies","compta","accountancy","products")); // Security check if (empty($conf->accounting->enabled)) { @@ -261,7 +256,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $result = $db->query($sql); $nbtotalofrecords = $db->num_rows($result); + if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0 + { + $page = 0; + $offset = 0; + } } + $sql .= $db->plimit($limit + 1, $offset); dol_syslog("/accountancy/admin/productaccount.php:: sql=" . $sql, LOG_DEBUG); @@ -272,8 +273,8 @@ if ($result) $i = 0; $param=''; - if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage; - if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit; + if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage); + if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit); if ($search_ref > 0) $param.="&search_desc=".urlencode($search_ref); if ($search_label > 0) $param.="&search_desc=".urlencode($search_label); if ($search_desc > 0) $param.="&search_desc=".urlencode($search_desc); @@ -300,10 +301,10 @@ if ($result) print '
| ' . $langs->trans("Label") . ' | ' . $langs->trans("JanuaryMin") . ' | ' . $langs->trans("FebruaryMin") . ' | ' . $langs->trans("MarchMin") . ' | ' . $langs->trans("AprilMin") . ' | ' . $langs->trans("MayMin") . ' | ' . $langs->trans("JuneMin") . ' | ' . $langs->trans("JulyMin") . ' | ' . $langs->trans("AugustMin") . ' | ' . $langs->trans("SeptemberMin") . ' | ' . $langs->trans("OctoberMin") . ' | ' . $langs->trans("NovemberMin") . ' | ' . $langs->trans("DecemberMin") . ' | Total |
| ' . $langs->trans("Label") . ' | '; +print '' . $langs->trans("JanuaryMin") . ' | '; +print '' . $langs->trans("FebruaryMin") . ' | '; +print '' . $langs->trans("MarchMin") . ' | '; +print '' . $langs->trans("AprilMin") . ' | '; +print '' . $langs->trans("MayMin") . ' | '; +print '' . $langs->trans("JuneMin") . ' | '; +print '' . $langs->trans("JulyMin") . ' | '; +print '' . $langs->trans("AugustMin") . ' | '; +print '' . $langs->trans("SeptemberMin") . ' | '; +print '' . $langs->trans("OctoberMin") . ' | '; +print '' . $langs->trans("NovemberMin") . ' | '; +print '' . $langs->trans("DecemberMin") . ' | '; +print 'Total | '; +print '
| ' . length_accountg($row[0]) . ' | '; + print '|||||||||||||
| ' . length_accountg($row[0]) . ' | '; print '' . price($row[1]) . ' | '; print '' . price($row[2]) . ' | '; print '' . price($row[3]) . ' | '; @@ -132,5 +140,6 @@ if ($resql) { } print "
';
print '
';
- print '';
+ print '';
+
+ dol_fiche_end();
print '';
print '';
@@ -416,7 +415,7 @@ if ($action == 'create')
// Account movement
print '';
print '' . $langs->trans("NumMvts") . ' ';
- print '' . $book->piece_num . ' ';
+ print '' . $object->piece_num . ' ';
print ' ';
// Date
@@ -425,19 +424,19 @@ if ($action == 'create')
print $langs->trans('Docdate');
print '';
if ($action != 'editdate')
- print 'piece_num .'&mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('SetDate'),1).' ';
+ print 'piece_num .'&mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('SetDate'),1).' ';
print '';
print '';
if ($action == 'editdate') {
- print '';
} else {
- print $book->doc_date ? dol_print_date($book->doc_date, 'day') : ' ';
+ print $object->doc_date ? dol_print_date($object->doc_date, 'day') : ' ';
}
print ' ';
print '';
@@ -448,19 +447,19 @@ if ($action == 'create')
print $langs->trans('Codejournal');
print '';
if ($action != 'editjournal')
- print 'piece_num.'&mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).' ';
+ print 'piece_num.'&mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).' ';
print '';
print '';
if ($action == 'editjournal') {
- print '';
} else {
- print $book->code_journal ;
+ print $object->code_journal ;
}
print ' ';
print '';
@@ -468,22 +467,22 @@ if ($action == 'create')
// Ref document
print '';
print '
';
print ' ';
if ($action == 'editdocref') {
- print '';
} else {
- print $book->doc_ref ;
+ print $object->doc_ref ;
}
print ' ';
print '';
// Doc type
- if(! empty($book->doc_type))
+ if(! empty($object->doc_type))
{
print '
\n";
- print '
| '; - print $langs->trans('Docref'); + print $langs->trans('Piece'); print ' | '; if ($action != 'editdocref') - print 'piece_num.'&mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).' | '; + print 'piece_num.'&mode='. $mode .'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).' | '; print '
| ' . $langs->trans("Doctype") . ' | '; - print '' . $book->doc_type . ' | '; + print '' . $object->doc_type . ' | '; print '
| ' . $langs->trans("DateCreation") . ' | '; print ''; - print $book->date_creation ? dol_print_date($book->date_creation, 'day') : ' '; + print $object->date_creation ? dol_print_date($object->date_creation, 'day') : ' '; print ' | '; print '|
| ' . $langs->trans("Status") . ' | '; print ''; - if (empty($book->validated)) { + if (empty($object->validated)) { print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); print ''; @@ -536,11 +535,11 @@ if ($action == 'create') /* print ' | |
| ' . $langs->trans("Control") . ' | '; - if ($book->doc_type == 'customer_invoice') + if ($object->doc_type == 'customer_invoice') { $sqlmid = 'SELECT rowid as ref'; $sqlmid .= " FROM ".MAIN_DB_PREFIX."facture as fac"; - $sqlmid .= " WHERE fac.rowid=" . $book->fk_doc; + $sqlmid .= " WHERE fac.rowid=" . $object->fk_doc; dol_syslog("accountancy/bookkeeping/card.php::sqlmid=" . $sqlmid, LOG_DEBUG); $resultmid = $db->query($sqlmid); if ($resultmid) { @@ -556,31 +555,32 @@ if ($action == 'create') */ print "
'; - $result = $book->fetchAllPerMvt($piece_num, $mode); + $result = $object->fetchAllPerMvt($piece_num, $mode); if ($result < 0) { - setEventMessages($book->error, $book->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } else { print load_fiche_titre($langs->trans("ListeMvts"), '', ''); - print '