';
print '| '.$langs->trans("AccountingCategory").' | ';
print ' | ';
-print ''.$langs->trans("PreviousYear").' | ';
+print ''.$langs->trans("PreviousPeriod").' | ';
print ''.$langs->trans("SelectedPeriod").' | ';
foreach($months as $k => $v){
print ''.$langs->trans($v).' | ';
@@ -262,8 +262,11 @@ else if ($modecompta=="BOOKKEEPING")
print "";
// Year NP
- //print '| ' . $cat['label'] . ' | ';
- print '' . $cat['label'] . ' | ';
+ print '';
+ print $cat['code'];
+ print ' | ';
+ print $cat['label'];
+ print ' | ';
$vars = array();
@@ -338,7 +341,9 @@ else if ($modecompta=="BOOKKEEPING")
print "
";
// Column group
- print '| ';
+ print ' | ';
+ print $cat['code'];
+ print ' | ';
print $cat['label'];
if (count($cpts) > 0)
{
@@ -429,7 +434,8 @@ else if ($modecompta=="BOOKKEEPING")
$resultN=$totPerAccount[$cpt['account_number']]['N'];
print ' |
';
- print '| ' . length_accountg($cpt['account_number']) . ' | ';
+ print ' | ';
+ print ' ' . length_accountg($cpt['account_number']) . '';
print '' . $cpt['name_cpt'] . ' | ';
print '' . price($resultNP) . ' | ';
print '' . price($resultN) . ' | ';
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 70293076fd8..f367f8ee436 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -165,7 +165,7 @@ if ($modecompta=="CREANCES-DETTES") {
$description.= $langs->trans("DepositsAreIncluded");
}
- $builddate=time();
+ $builddate=dol_now();
} else {
$calcmode=$langs->trans("CalcModeEngagement");
$calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')';
@@ -175,7 +175,7 @@ if ($modecompta=="CREANCES-DETTES") {
$description=$langs->trans("RulesCAIn");
$description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
}
report_header($name,$namelink,$period,$periodlink,$description,$builddate,$exportlink,$tableparams,$calcmode);
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 37d9119685b..4904f1ee5ca 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -143,7 +143,7 @@ if ($modecompta=="CREANCES-DETTES") {
$description=$langs->trans("RulesCADue");
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
else $description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
} else {
$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
@@ -153,7 +153,7 @@ if ($modecompta=="CREANCES-DETTES") {
//$periodlink="".img_previous()." ".img_next()."";
$description=$langs->trans("RulesCAIn");
$description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
$moreparam=array();
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 191a6f48284..f59b6fc454f 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -173,7 +173,7 @@ if ($modecompta=="CREANCES-DETTES")
$description=$langs->trans("RulesCADue");
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
else $description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
} else {
$name=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
@@ -183,7 +183,7 @@ if ($modecompta=="CREANCES-DETTES")
//$periodlink=''.img_previous().' '.img_next().'';
$description=$langs->trans("RulesCAIn");
$description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index a6e8064f1a9..335cf581740 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -118,7 +118,7 @@ if ($modecompta=="CREANCES-DETTES")
$description=$langs->trans("RulesCADue");
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
else $description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
else if ($modecompta=="RECETTES-DEPENSES")
@@ -131,7 +131,7 @@ else if ($modecompta=="RECETTES-DEPENSES")
$periodlink=($year_start?"".img_previous()." ".img_next()."":"");
$description=$langs->trans("RulesCAIn");
$description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
else if ($modecompta=="BOOKKEEPING")
@@ -145,7 +145,7 @@ else if ($modecompta=="BOOKKEEPING")
$description=$langs->trans("RulesCADue");
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
else $description.= $langs->trans("DepositsAreIncluded");
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index b41d23303cf..ae6b178f8dd 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -160,7 +160,7 @@ if ($modetax==1) { // Calculate on invoice for goods and services
. $langs->trans('AddExtraReport')
. ''
. '
';
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
$elementcust=$langs->trans("CustomersInvoices");
@@ -204,7 +204,7 @@ if ($modetax==0) { // Invoice for goods, payment for services
. $langs->trans('AddExtraReport')
. ''
. '
';
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
$elementcust=$langs->trans("CustomersInvoices");
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index a92e79b81a3..bb42298f577 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -152,7 +152,7 @@ if ($modetax==1) // Calculate on invoice for goods and services
if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.='
'.$langs->trans("DepositsAreNotIncluded");
else $description.='
'.$langs->trans("DepositsAreIncluded");
$description.=$fsearch;
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
// Customers invoices
@@ -192,7 +192,7 @@ if ($modetax==0) // Invoice for goods, payment for services
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='
'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
// Customers invoices
diff --git a/htdocs/compta/tva/quarter_report.php b/htdocs/compta/tva/quarter_report.php
index 2f35e5f10ba..209e38e2a53 100644
--- a/htdocs/compta/tva/quarter_report.php
+++ b/htdocs/compta/tva/quarter_report.php
@@ -174,7 +174,7 @@ if ($modetax==1) { // Calculate on invoice for goods and services
$description.='
'.$langs->trans("DepositsAreIncluded");
}
$description.=$fsearch;
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
$elementcust=$langs->trans("CustomersInvoices");
@@ -224,7 +224,7 @@ if ($modetax==0) { // Invoice for goods, payment for services
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='
'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
- $builddate=time();
+ $builddate=dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
$elementcust=$langs->trans("CustomersInvoices");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9b643efa086..8443e077b30 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3316,10 +3316,10 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
* @param string $field Field to use for new sorting. Empty if this field is not sortable.
* @param string $begin ("" by defaut)
* @param string $moreparam Add more parameters on sort url links ("" by default)
- * @param string $moreattrib Add more attributes on th ("" by defaut). To add more css class, use param $prefix.
+ * @param string $moreattrib Add more attributes on th ("" by defaut, example: 'align="center"'). To add more css class, use param $prefix.
* @param string $sortfield Current field used to sort (Ex: 'd.datep,d.id')
* @param string $sortorder Current sort order (Ex: 'asc,desc')
- * @param string $prefix Prefix for css. Use space after prefix to add your own CSS tag.
+ * @param string $prefix Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
* @param string $disablesortlink 1=Disable sort link
* @param string $tooltip Tooltip
* @return string
@@ -3342,7 +3342,6 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
$field1=trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'
//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
-
// If field is used as sort criteria we use a specific css class liste_titre_sel
// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./","",$field1))) $out.= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '. $moreattrib.'>';
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 1b80a4bc2ec..b84b8d77e47 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -106,7 +106,7 @@ function report_header($nom,$variante,$period,$periodlink,$description,$builddat
print ''.$langs->trans("GeneratedOn").' | ';
if (! $exportlink) print '';
else print ' | ';
- print dol_print_date($builddate);
+ print dol_print_date($builddate, 'dayhour');
if ($exportlink) print ' | '.$langs->trans("Export").' | '.$exportlink;
print ' |
';
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 1362fd71b81..7712386d30a 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -31,8 +31,6 @@ ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account
JournalizationInLedgerStatus=Status of journalization
AlreadyInGeneralLedger=Already journalized in ledgers
NotYetInGeneralLedger=Not yet journalized in ledgers
-PreviousYear=Previous year
-SelectedPeriod=Selected period
GroupIsEmptyCheckSetup=Group is empty, check setup of the accounting group
DetailByAccount=Show detail by account
@@ -152,7 +150,7 @@ Sens=Sens
Codejournal=Journal
NumPiece=Piece number
TransactionNumShort=Num. transaction
-AccountingCategory=Accounting account groups
+AccountingCategory=Personalized groups
GroupByAccountAccounting=Group by accounting account
AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups.
ByAccounts=By accounts
@@ -263,7 +261,7 @@ OptionModeProductSellDesc=Show all products with accounting account for sales.
OptionModeProductBuyDesc=Show all products with accounting account for purchases.
CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
CleanHistory=Reset all bindings for selected year
-
+PredefinedGroups=Predefined groups
WithoutValidAccount=Without valid dedicated account
WithValidAccount=With valid dedicated account
ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
@@ -282,4 +280,4 @@ NoJournalDefined=No journal defined
Binded=Lines bound
ToBind=Lines to bind
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. It will be replaced by a more complete report in a next version.
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 89b6f045e4e..5369f0d4451 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -883,7 +883,7 @@ DictionaryStaff=Staff
DictionaryAvailability=Delivery delay
DictionaryOrderMethods=Ordering methods
DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting account groups
+DictionaryAccountancyCategory=Personalized groups
DictionaryAccountancysystem=Models for chart of accounts
DictionaryAccountancyJournal=Accounting journals
DictionaryEMailTemplates=Emails templates
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 8cc98f82def..521618fcd65 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -147,8 +147,8 @@ AnnualByCompanies=Income / Expenses, By predefined groups of account
AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode %sClaims-Debts%s said Commitment accounting.
AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode %sIncomes-Expenses%s said cash accounting.
SeeReportInInputOutputMode=See report %sIncomes-Expenses%s said cash accounting for a calculation on actual payments made
-SeeReportInDueDebtMode=See report %sClaims-Debts%s said commitment accounting for a calculation on issued invoices
-SeeReportInBookkeepingMode=See report %sBookeeping%s for a calculation on bookkeeping table analysis
+SeeReportInDueDebtMode=See report %sClaims-Debts%s said commitment accounting for a calculation on issued invoices
+SeeReportInBookkeepingMode=See report %sBookeeping%s for a calculation on bookkeeping table analysis
RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.
- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries.
- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -157,7 +157,7 @@ RulesCAIn=- It includes all the effective payments of invoices received from cli
RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE/PRODUCT|SERVICE" or "INCOME/PRODUCT|SERVICE"
RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE/PRODUCT|SERVICE" or "INCOME/PRODUCT|SERVICE"
RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts grouped by personalized groups
-SeePageForSetup=See menu %s for setup.
+SeePageForSetup=See menu %s for setup
DepositsAreNotIncluded=- Down payment invoices are nor included
DepositsAreIncluded=- Down payment invoices are included
LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2acced5495c..9b9c92636d5 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -129,6 +129,8 @@ Never=Never
Under=under
Period=Period
PeriodEndDate=End date for period
+SelectedPeriod=Selected period
+PreviousPeriod=Previous period
Activate=Activate
Activated=Activated
Closed=Closed
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index cfc43113eda..e5ba6bad702 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -104,7 +104,7 @@ $exportlink = '';
$nom = $langs->trans("ReportThirdParty");
$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
$description = $langs->trans("DescThirdPartyReport");
-$builddate = time();
+$builddate=dol_now();
$moreparam=array('action' => '');
report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam);