diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 19c076242f8..5e56ac2a1fc 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -101,28 +101,30 @@ Long description (Can span accross multiple lines).
### Pull Requests
-When submitting a pull request, use same rule as [Commits](#commits) for the message.
+Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and
+a process to follow to optimize the chance to have PRs merged efficiently...
-If your pull request only contains one commit, GitHub will be smart enough to fill it for you.
+When submitting a pull request, use same rule as [Commits](#commits) for the message.
+If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you.
Otherwise, please be a bit verbose about what you're providing.
-Your Pull Request (PR) must pass the Continuous Integration checks.
+Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
Also, some code changes need a prior approbation:
* if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
-* if you add a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project manager (@eldy) if the new data model you plan to add can be accepted as you suggest.
+* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@eldy) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
-Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR.
+Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
If the label of PR start with "WIP" (Work In Progress), it will not be analyzed (until you change the label of PR).
If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
-In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the flag ask you. The majority of PR are waiting an action of the developer/author.
+In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
-Statistics on Dolibarr project shows that around 95% of submitted PR are reviewed and tagged. This is one of the most important ratio of answered PR in Open Source world. Don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
+Statistics on Dolibarr project shows that around 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source project (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
### Resources
diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
new file mode 100644
index 00000000000..55599654707
--- /dev/null
+++ b/.github/workflows/stale-issues-safe.yml
@@ -0,0 +1,24 @@
+# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: "Close stale issues (bugs and feature requests)"
+
+on:
+ schedule:
+ - cron: "0 21 * * *"
+ issue_comment:
+ types: [created]
+
+jobs:
+ stale:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: Dolibarr/stale@staleunstale
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+ stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 15 days (you should still be able to re-open it if required).'
+ stale-label: 'Issue Stale (automatic label)'
+ exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE)'
+ days-before-stale: 365
+ days-before-close: 15
+ operations-per-run: 100
+ dry-run: false
+
\ No newline at end of file
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml.disabled
similarity index 87%
rename from .github/workflows/stale-issues.yml
rename to .github/workflows/stale-issues.yml.disabled
index 633cc53437b..6e7dad5dc9b 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml.disabled
@@ -12,12 +12,12 @@ jobs:
- uses: Dolibarr/stale@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- stale-issue-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. Without comment, this issue will be closed automatically by stale bot in 15 days.'
+ stale-issue-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 15 days (you should still be able to re-open it if required).'
stale-issue-label: 'Issue Stale (automatic label)'
exempt-issue-label: 'Priority High / Blocking'
days-before-stale: 365
- days-before-close: 15
- operations-per-run: 50
+ days-before-close: -1
+ operations-per-run: 100
#stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
stale-pr-label: 'PR Stale (automatic label)'
stale-pr-message:
diff --git a/.gitignore b/.gitignore
index ffacba65feb..30151359365 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ htdocs/includes/sebastian/
htdocs/includes/squizlabs/
htdocs/includes/symfony/
htdocs/includes/webmozart/
+htdocs/.well-known/apple-developer-merchantid-domain-association
diff --git a/COPYRIGHT b/COPYRIGHT
index fe707c1d63d..c1f400aff4e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -17,7 +17,7 @@ CKEditor 4.12.1 LGPL-2.1+ Yes
EvalMath 1.0 BSD Yes Safe math expressions evaluation
Escpos-php 2.2 MIT License Yes Thermal receipt printer library, for use with ESC/POS compatible printers
GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
-Mobiledetect 2.8.33 MIT License Yes Detect mobile devices browsers
+Mobiledetect 2.8.34 MIT License Yes Detect mobile devices browsers
NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency
ParseDown 1.6 MIT License Yes Markdown parser
@@ -32,15 +32,16 @@ PSR/simple-cache ? Library for cache (used by PHPSp
Restler 3.0.0RC6 LGPL-3+ Yes Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
Sabre 3.2.2 BSD Yes DAV support
Swift Mailer 5.4.2-DEV MIT license Yes Comprehensive mailing tools for PHP
-Stripe 6.41 MIT licence Yes Library for Stripe module
+Stripe 6.43.1 MIT licence Yes Library for Stripe module
TCPDF 6.3.2 LGPL-3+ Yes PDF generation
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
JS libraries:
-Ace 1.4.6 BSD Yes JS library to get code syntaxique coloration in a textarea.
+Ace 1.4.8 BSD Yes JS library to get code syntaxique coloration in a textarea.
+Chart 2.9.3 MIT License Yes JS library for graph
jQuery 3.4.1 MIT License Yes JS library
jQuery UI 1.12.1 GPL and MIT License Yes JS library plugin UI
-jQuery select2 4.0.5 GPL and Apache License Yes JS library plugin for sexier multiselect
+jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect
jQuery blockUI 2.70.0 GPL and MIT License Yes JS library plugin blockUI (to use ajax popups)
jQuery Colorpicker 1.1 MIT License Yes JS library for color picker for a defined list of colors
jQuery Flot 0.8.3 MIT License Yes JS library to build graph
diff --git a/ChangeLog b/ChangeLog
index c6cd7463316..6f48691d299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,10 @@ For Users:
NEW: Module MO (Manufacturing Order) is available as stable module.
For Developers or integrators:
-
+* A new way to navigate between pages in list is available. To use it, you must
+ - replace $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+ - remove input field in form ' '; }
if (!empty($arrayfields['aa.active']['checked'])) print ' ';
print '';
$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
@@ -365,6 +371,7 @@ if ($resql)
if (!empty($arrayfields['aa.labelshort']['checked'])) print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['aa.account_parent']['checked'])) print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
if (!empty($arrayfields['aa.pcg_type']['checked'])) print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
+ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (! empty($arrayfields['aa.reconciliable']['checked'])) print_liste_field_titre($arrayfields['aa.reconciliable']['label'], $_SERVER["PHP_SELF"], 'aa.reconciliable', '', $param, '', $sortfield, $sortorder); }
if (!empty($arrayfields['aa.active']['checked'])) print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
@@ -441,16 +448,36 @@ if ($resql)
if (!$i) $totalarray['nbfield']++;
}
+ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+ // Activated or not reconciliation on accounting account
+ if (!empty($arrayfields['aa.reconciliable']['checked'])) {
+ print ' ';
+ if (empty($obj->reconciliable)) {
+ print '';
+ print img_picto($langs->trans("Disabled"), 'switch_off');
+ print ' ';
+ } else {
+ print '';
+ print img_picto($langs->trans("Activated"), 'switch_on');
+ print ' ';
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ }
+
// Activated or not
if (!empty($arrayfields['aa.active']['checked']))
{
- print '';
+ print ' ';
if (empty($obj->active)) {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
}
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 2ed3ad44695..0ab42d582d1 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -61,7 +61,7 @@ $active = 1;
$sortfield = GETPOST("sortfield", 'aZ09comma');
$sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $listlimit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 50cf04a490a..500a0d3cbba 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -56,7 +56,7 @@ $active = 1;
$sortfield = GETPOST("sortfield", 'aZ09comma');
$sortorder = GETPOST("sortorder", 'aZ09comma');
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $listlimit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index c0c3f835481..ad22a88f415 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -1,7 +1,7 @@
* Copyright (C) 2013-2014 Florian Henry
- * Copyright (C) 2013-2019 Alexandre Spangaro
+ * Copyright (C) 2013-2020 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2014 Marcos García
* Copyright (C) 2014 Juanjo Menent
@@ -46,27 +46,35 @@ if (empty($user->rights->accounting->chartofaccount))
$action = GETPOST('action', 'aZ09');
-$list_account_main = array (
+$list_account_main = array(
'ACCOUNTING_ACCOUNT_CUSTOMER',
'ACCOUNTING_ACCOUNT_SUPPLIER',
'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
);
-$list_account = array ();
+$list_account = array();
$list_account[] = '---Product---';
-$list_account[] = 'ACCOUNTING_PRODUCT_BUY_ACCOUNT';
$list_account[] = 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT';
if ($mysoc->isInEEC()) {
$list_account[] = 'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT';
}
$list_account[] = 'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT';
+$list_account[] = 'ACCOUNTING_PRODUCT_BUY_ACCOUNT';
+if ($mysoc->isInEEC()) {
+ $list_account[] = 'ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT';
+}
+$list_account[] = 'ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT';
$list_account[] = '---Service---';
-$list_account[] = 'ACCOUNTING_SERVICE_BUY_ACCOUNT';
$list_account[] = 'ACCOUNTING_SERVICE_SOLD_ACCOUNT';
if ($mysoc->isInEEC()) {
$list_account[] = 'ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT';
}
$list_account[] = 'ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT';
+$list_account[] = 'ACCOUNTING_SERVICE_BUY_ACCOUNT';
+if ($mysoc->isInEEC()) {
+ $list_account[] = 'ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT';
+}
+$list_account[] = 'ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT';
$list_account[] = '---Other---';
$list_account[] = 'ACCOUNTING_VAT_BUY_ACCOUNT';
$list_account[] = 'ACCOUNTING_VAT_SOLD_ACCOUNT';
@@ -112,25 +120,25 @@ if ($action == 'update') {
foreach ($list_account_main as $constname) {
$constvalue = GETPOST($constname, 'alpha');
- if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
- $error ++;
+ if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+ $error++;
}
}
foreach ($list_account as $constname) {
- $reg=array();
+ $reg = array();
if (preg_match('/---(.*)---/', $constname, $reg)) { // This is a separator
continue;
}
$constvalue = GETPOST($constname, 'alpha');
- if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
- $error ++;
+ if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+ $error++;
}
}
- if (! $error) {
+ if (!$error) {
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} else {
setEventMessages($langs->trans("Error"), null, 'errors');
@@ -182,7 +190,7 @@ foreach ($list_account_main as $key) {
foreach ($list_account as $key) {
- $reg=array();
+ $reg = array();
if (preg_match('/---(.*)---/', $key, $reg)) {
print ''.$langs->trans($reg[1]).' ';
// Param
$label = $langs->trans($key);
- print '' . $label . ' ';
+ print ''.$label.' ';
// Value
- print ''; // Do not force class=right, or it align also the content of the select box
+ print ' '; // Do not force class=right, or it align also the content of the select box
print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
print ' ';
print ' ';
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 7dd4ae1a935..b5cc46a3d0d 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -31,7 +31,7 @@ $action = GETPOST('action', 'aZ09');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index e47fba72756..eccb7450594 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -57,7 +57,7 @@ $active = 1;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $listlimit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 60c9c88f0c8..c6c76a57621 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2013-2019 Alexandre Spangaro
+ * Copyright (C) 2013-2020 Alexandre Spangaro
* Copyright (C) 2014 Florian Henry
* Copyright (C) 2014 Juanjo Menent
* Copyright (C) 2015 Ari Elbaz (elarifr)
@@ -59,7 +59,7 @@ $search_label = GETPOST('search_label', 'alpha');
$search_desc = GETPOST('search_desc', 'alpha');
$search_current_account = GETPOST('search_current_account', 'alpha');
$search_current_account_valid = GETPOST('search_current_account_valid', 'alpha');
-if ($search_current_account_valid == '') $search_current_account_valid='withoutvalidaccount';
+if ($search_current_account_valid == '') $search_current_account_valid = 'withoutvalidaccount';
$search_onsell = GETPOST('search_onsell', 'alpha');
$search_onpurchase = GETPOST('search_onpurchase', 'alpha');
@@ -67,12 +67,12 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
$btn_changeaccount = GETPOST('changeaccount', 'alpha');
$btn_changetype = GETPOST('changetype', 'alpha');
-if (empty($accounting_product_mode)) $accounting_product_mode='ACCOUNTANCY_SELL';
+if (empty($accounting_product_mode)) $accounting_product_mode = 'ACCOUNTANCY_SELL';
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
@@ -117,7 +117,9 @@ if ($action == 'update') {
'ACCOUNTANCY_SELL',
'ACCOUNTANCY_SELL_INTRA',
'ACCOUNTANCY_SELL_EXPORT',
- 'ACCOUNTANCY_BUY'
+ 'ACCOUNTANCY_BUY',
+ 'ACCOUNTANCY_BUY_INTRA',
+ 'ACCOUNTANCY_BUY_EXPORT'
);
if (in_array($accounting_product_mode, $accounting_product_modes)) {
@@ -159,6 +161,12 @@ if ($action == 'update') {
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
$sql .= " SET accountancy_code_buy = ".$accounting->account_number;
}
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+ $sql .= " SET accountancy_code_buy_intra = ".$accounting->account_number;
+ }
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+ $sql .= " SET accountancy_code_buy_export = ".$accounting->account_number;
+ }
if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
$sql .= " SET accountancy_code_sell = ".$accounting->account_number;
}
@@ -204,7 +212,11 @@ $form = new FormAccounting($db);
$accounting = new AccountingAccount($db);
// TODO: we should need to check if result is already exists accountaccount rowid.....
$aarowid_servbuy = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
+$aarowid_servbuy_intra = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT, 1);
+$aarowid_servbuy_export = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT, 1);
$aarowid_prodbuy = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT, 1);
+$aarowid_prodbuy_intra = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT, 1);
+$aarowid_prodbuy_export = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT, 1);
$aarowid_servsell = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
$aarowid_servsell_intra = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT, 1);
$aarowid_servsell_export = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT, 1);
@@ -212,47 +224,68 @@ $aarowid_prodsell = $accounting->fetch('', $conf->global->ACCOUNTING_P
$aarowid_prodsell_intra = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT, 1);
$aarowid_prodsell_export = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT, 1);
-$aacompta_servbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servsell_intra = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servsell_export = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodsell_intra = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodsell_export = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servbuy_intra = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servbuy_export = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodbuy_intra = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodbuy_export = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servsell_intra = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servsell_export = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodsell_intra = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_prodsell_export = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
llxHeader('', $langs->trans("ProductsBinding"));
$pcgverid = $conf->global->CHARTOFACCOUNTS;
$pcgvercode = dol_getIdFromCode($db, $pcgverid, 'accounting_system', 'rowid', 'pcg_version');
-if (empty($pcgvercode)) $pcgvercode=$pcgverid;
+if (empty($pcgvercode)) $pcgvercode = $pcgverid;
$sql = "SELECT p.rowid, p.ref, p.label, p.description, p.tosell, p.tobuy,";
-$sql.= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy,";
-$sql.= " p.tms, p.fk_product_type as product_type,";
-$sql.= " aa.rowid as aaid";
-$sql.= " FROM " . MAIN_DB_PREFIX . "product as p";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON";
+$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
+$sql .= " p.tms, p.fk_product_type as product_type,";
+$sql .= " aa.rowid as aaid";
+$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON";
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
- $sql.=" p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '" . $pcgvercode . "'";
+ $sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
+}
+elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
+{
+ $sql .= " p.accountancy_code_buy_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
+}
+elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
+{
+ $sql .= " p.accountancy_code_buy_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
}
elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
{
- $sql.=" p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '" . $pcgvercode . "'";
+ $sql .= " p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
}
elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
{
- $sql.=" p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '" . $pcgvercode . "'";
+ $sql .= " p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
}
else
{
- $sql.=" p.accountancy_code_sell_export = aa.account_number AND aa.fk_pcg_version = '" . $pcgvercode . "'";
+ $sql .= " p.accountancy_code_sell_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
}
-$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
+$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
if (strlen(trim($search_current_account))) {
$sql .= natural_search("p.accountancy_code_buy", $search_current_account);
}
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+ if (strlen(trim($search_current_account))) {
+ $sql .= natural_search("p.accountancy_code_buy_intra", $search_current_account);
+ }
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+ if (strlen(trim($search_current_account))) {
+ $sql .= natural_search("p.accountancy_code_buy_export", $search_current_account);
+ }
} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
if (strlen(trim($search_current_account))) {
$sql .= natural_search("p.accountancy_code_sell", $search_current_account);
@@ -286,8 +319,8 @@ if (strlen(trim($search_label))) {
if (strlen(trim($search_desc))) {
$sql .= natural_search("p.description", $search_desc);
}
-if ($search_onsell != '' && $search_onsell != '-1') $sql.= natural_search('p.tosell', $search_onsell, 1);
-if ($search_onpurchase != '' && $search_onpurchase != '-1') $sql.= natural_search('p.tobuy', $search_onpurchase, 1);
+if ($search_onsell != '' && $search_onsell != '-1') $sql .= natural_search('p.tosell', $search_onsell, 1);
+if ($search_onpurchase != '' && $search_onpurchase != '-1') $sql .= natural_search('p.tobuy', $search_onpurchase, 1);
$sql .= $db->order($sortfield, $sortorder);
@@ -334,70 +367,77 @@ if ($result)
print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
print ''.$langs->trans("InitAccountancyDesc") . ' '.$langs->trans("InitAccountancyDesc").'
';
+ print '
';
print "'.$buttonsave.'
';
- $texte=$langs->trans("ListOfProductsServices");
+ $texte = $langs->trans("ListOfProductsServices");
print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $buttonsave, $num, $nbtotalofrecords, '', 0, '', '', $limit);
print '';
- print '
';
+ print '';
print '';
- print ''.$form->selectyesno('search_onsell', $search_onsell, 1, false, 1).' ';
}
// On buy
- elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+ elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY' || $accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
print ''.$form->selectyesno('search_onpurchase', $search_onpurchase, 1, false, 1).' ';
}
// Current account
print '';
- print ' ';
print ' ';
print '';
- $searchpicto=$form->showFilterButtons();
+ $searchpicto = $form->showFilterButtons();
print $searchpicto;
print ' ';
print ' ';
@@ -405,30 +445,36 @@ if ($result)
print '';
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);
+ if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
// On sell / On purchase
if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
- $fieldtosortaccount="p.accountancy_code_sell";
+ $fieldtosortaccount = "p.accountancy_code_sell";
} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
- $fieldtosortaccount="p.accountancy_code_sell_intra";
+ $fieldtosortaccount = "p.accountancy_code_sell_intra";
} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
- $fieldtosortaccount="p.accountancy_code_sell_export";
- } else {
- if ($accounting_product_mode == 'ACCOUNTANCY_BUY') print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
- $fieldtosortaccount="p.accountancy_code_buy";
- }
+ $fieldtosortaccount = "p.accountancy_code_sell_export";
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+ print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
+ $fieldtosortaccount = "p.accountancy_code_buy";
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+ print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
+ $fieldtosortaccount = "p.accountancy_code_buy_intra";
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+ print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
+ $fieldtosortaccount = "p.accountancy_code_buy_export";
+ }
print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("AssignDedicatedAccountingAccount");
- $clickpitco=$form->showCheckAddButtons('checkforselect', 1);
+ $clickpitco = $form->showCheckAddButtons('checkforselect', 1);
print_liste_field_titre($clickpitco, '', '', '', '', '', '', '', 'center ');
print ' ';
$product_static = new Product($db);
- $i=0;
+ $i = 0;
while ($i < min($num, $limit))
{
$obj = $db->fetch_object($result);
@@ -445,48 +491,77 @@ if ($result)
// Sales
if ($obj->product_type == 0) {
if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
$compta_prodsell_id = $aarowid_prodsell;
}
elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
$compta_prodsell_id = $aarowid_prodsell_intra;
}
elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
$compta_prodsell_id = $aarowid_prodsell_export;
}
else {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
- $compta_prodsell_id = $aarowid_servsell;
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell_id = $aarowid_prodsell;
}
}
else {
if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
- $compta_prodsell_id = $aarowid_prodsell;
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell_id = $aarowid_servsell;
}
elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
- $compta_prodsell_id = $aarowid_prodsell_intra;
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell_id = $aarowid_servsell_intra;
}
elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
- $compta_prodsell_id = $aarowid_prodsell_export;
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell_id = $aarowid_servsell_export;
}
else {
- $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
$compta_prodsell_id = $aarowid_servsell;
}
}
// Purchases
if ($obj->product_type == 0) {
- $compta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
- $compta_prodbuy_id = $aarowid_prodbuy;
- } else {
- $compta_prodbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
- $compta_prodbuy_id = $aarowid_servbuy;
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_prodbuy;
+ }
+ elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_prodbuy_intra;
+ }
+ elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_prodbuy_export;
+ }
+ else {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_prodbuy;
+ }
+ }
+ else {
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_servbuy;
+ }
+ elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_servbuy_intra;
+ }
+ elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_servbuy_export;
+ }
+ else {
+ $compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+ $compta_prodbuy_id = $aarowid_servbuy;
+ }
}
print '';
@@ -509,7 +584,7 @@ if ($result)
if ($accounting_product_mode == 'ACCOUNTANCY_SELL' || $accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT')
print ''.$product_static->getLibStatut(3, 0).' ';
- if ($accounting_product_mode == 'ACCOUNTANCY_BUY')
+ if ($accounting_product_mode == 'ACCOUNTANCY_BUY' || $accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
print ''.$product_static->getLibStatut(3, 1).' ';
// Current accounting account
@@ -517,7 +592,13 @@ if ($result)
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
print length_accountg($obj->accountancy_code_buy);
if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
- } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+ print length_accountg($obj->accountancy_code_buy_intra);
+ if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+ print length_accountg($obj->accountancy_code_buy_export);
+ if ($obj->accountancy_code_buy_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
print length_accountg($obj->accountancy_code_sell);
if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
@@ -530,52 +611,72 @@ if ($result)
print '';
// New account to set
- $defaultvalue='';
+ $defaultvalue = '';
if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
// Accounting account buy
print '';
//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
- if (empty($defaultvalue)) $defaultvalue=$compta_prodbuy;
- $codesell=length_accountg($obj->accountancy_code_buy);
- if (! empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
- print $form->select_account($defaultvalue, 'codeventil_' . $product_static->id, 1, array(), 1);
+ if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
+ $codesell = length_accountg($obj->accountancy_code_buy);
+ if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+ print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+ print ' ';
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+ // Accounting account buy intra (In EEC)
+ print '';
+ //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
+ if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy_intra;
+ $codesell = length_accountg($obj->accountancy_code_buy_intra);
+ //var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
+ if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+ print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+ print ' ';
+ } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+ // Accounting account buy export (Out of EEC)
+ print '';
+ //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
+ if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy_export;
+ $codesell = length_accountg($obj->accountancy_code_buy_export);
+ //var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
+ if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+ print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
print ' ';
} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
// Accounting account sell
print '';
//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
- if (empty($defaultvalue)) $defaultvalue=$compta_prodsell;
- $codesell=length_accountg($obj->accountancy_code_sell);
+ if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+ $codesell = length_accountg($obj->accountancy_code_sell);
//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
- if (! empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
- print $form->select_account($defaultvalue, 'codeventil_' . $product_static->id, 1, array(), 1);
+ if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+ print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
print ' ';
} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
// Accounting account sell intra (In EEC)
print '';
//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
- if (empty($defaultvalue)) $defaultvalue=$compta_prodsell;
- $codesell=length_accountg($obj->accountancy_code_sell_intra);
+ if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+ $codesell = length_accountg($obj->accountancy_code_sell_intra);
//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
- if (! empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
- print $form->select_account($defaultvalue, 'codeventil_' . $product_static->id, 1, array(), 1);
+ if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+ print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
print ' ';
} else {
// Accounting account sell export (Out of EEC)
print '';
//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code
- if (empty($defaultvalue)) $defaultvalue=$compta_prodsell;
- $codesell=length_accountg($obj->accountancy_code_sell_export);
- if (! empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
- print $form->select_account($defaultvalue, 'codeventil_' . $product_static->id, 1, array(), 1);
+ if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+ $codesell = length_accountg($obj->accountancy_code_sell_export);
+ if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+ print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
print ' ';
}
// Checkbox select
print '';
- print ' ';
+ print ' ";
- $i ++;
+ $i++;
}
print '
';
print '';
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 58dbf20e7bf..b2a25b00ce2 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
// Load translation files required by the page
$langs->loadLangs(array("accountancy"));
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
$sortorder = GETPOST("sortorder", 'alpha');
$sortfield = GETPOST("sortfield", 'alpha');
$action = GETPOST('action', 'aZ09');
@@ -47,7 +47,7 @@ $action = GETPOST('action', 'aZ09');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
$offset = $limit * $page;
$pageprev = $page - 1;
@@ -254,7 +254,7 @@ if ($action != 'export_csv')
print '';
print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
- print_liste_field_titre("Opening Balance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
+ print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
@@ -271,7 +271,7 @@ if ($action != 'export_csv')
$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."' GROUP BY t.numero_compte";
$resql = $db->query($sql);
$nrows = $resql->num_rows;
- $opening_balances = Array();
+ $opening_balances = array();
for ($i = 0; $i < $nrows; $i++) {
$arr = $resql->fetch_array();
$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 9b6ad2fbbb0..e50112f7ff1 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -93,7 +93,7 @@ $search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) { $page = 0; }
$offset = $limit * $page;
$pageprev = $page - 1;
@@ -204,7 +204,7 @@ if (empty($reshook))
$search_debit = '';
$search_credit = '';
$search_lettering_code = '';
- $search_not_reconciled='';
+ $search_not_reconciled = '';
}
// Must be after the remove filter action, before the export.
@@ -276,32 +276,32 @@ if (empty($reshook))
if (!empty($search_date_creation_start)) {
$filter['t.date_creation>='] = $search_date_creation_start;
$tmp = dol_getdate($search_date_creation_start);
- $param .= '&date_creation_startmonth=' . urlencode($tmp['mon']) . '&date_creation_startday=' . urlencode($tmp['mday']) . '&date_creation_startyear=' . urlencode($tmp['year']);
+ $param .= '&date_creation_startmonth='.urlencode($tmp['mon']).'&date_creation_startday='.urlencode($tmp['mday']).'&date_creation_startyear='.urlencode($tmp['year']);
}
if (!empty($search_date_creation_end)) {
$filter['t.date_creation<='] = $search_date_creation_end;
$tmp = dol_getdate($search_date_creation_end);
- $param .= '&date_creation_endmonth=' .urlencode($tmp['mon']) . '&date_creation_endday=' . urlencode($tmp['mday']) . '&date_creation_endyear=' . urlencode($tmp['year']);
+ $param .= '&date_creation_endmonth='.urlencode($tmp['mon']).'&date_creation_endday='.urlencode($tmp['mday']).'&date_creation_endyear='.urlencode($tmp['year']);
}
if (!empty($search_date_modification_start)) {
$filter['t.tms>='] = $search_date_modification_start;
$tmp = dol_getdate($search_date_modification_start);
- $param .= '&date_modification_startmonth=' . urlencode($tmp['mon']) . '&date_modification_startday=' . urlencode($tmp['mday']) . '&date_modification_startyear=' . urlencode($tmp['year']);
+ $param .= '&date_modification_startmonth='.urlencode($tmp['mon']).'&date_modification_startday='.urlencode($tmp['mday']).'&date_modification_startyear='.urlencode($tmp['year']);
}
if (!empty($search_date_modification_end)) {
$filter['t.tms<='] = $search_date_modification_end;
$tmp = dol_getdate($search_date_modification_end);
- $param .= '&date_modification_endmonth=' . urlencode($tmp['mon']) . '&date_modification_endday=' . urlencode($tmp['mday']) . '&date_modification_endyear=' . urlencode($tmp['year']);
+ $param .= '&date_modification_endmonth='.urlencode($tmp['mon']).'&date_modification_endday='.urlencode($tmp['mday']).'&date_modification_endyear='.urlencode($tmp['year']);
}
if (!empty($search_date_export_start)) {
$filter['t.date_export>='] = $search_date_export_start;
$tmp = dol_getdate($search_date_export_start);
- $param .= '&date_export_startmonth=' . urlencode($tmp['mon']) . '&date_export_startday=' . urlencode($tmp['mday']) . '&date_export_startyear=' . urlencode($tmp['year']);
+ $param .= '&date_export_startmonth='.urlencode($tmp['mon']).'&date_export_startday='.urlencode($tmp['mday']).'&date_export_startyear='.urlencode($tmp['year']);
}
if (!empty($search_date_export_end)) {
$filter['t.date_export<='] = $search_date_export_end;
$tmp = dol_getdate($search_date_export_end);
- $param .= '&date_export_endmonth=' . urlencode($tmp['mon']) . '&date_export_endday=' . urlencode($tmp['mday']) . '&date_export_endyear=' . urlencode($tmp['year']);
+ $param .= '&date_export_endmonth='.urlencode($tmp['mon']).'&date_export_endday='.urlencode($tmp['mday']).'&date_export_endyear='.urlencode($tmp['year']);
}
if (!empty($search_debit)) {
$filter['t.debit'] = $search_debit;
@@ -315,9 +315,9 @@ if (empty($reshook))
$filter['t.lettering_code'] = $search_lettering_code;
$param .= '&search_lettering_code='.urlencode($search_lettering_code);
}
- if (! empty($search_not_reconciled)) {
+ if (!empty($search_not_reconciled)) {
$filter['t.reconciled_option'] = $search_not_reconciled;
- $param .= '&search_not_reconciled=' . urlencode($search_not_reconciled);
+ $param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
}
}
@@ -768,7 +768,7 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
{
print '';
print ' ';
}
// Code journal
@@ -953,9 +953,9 @@ while ($i < min($num, $limit))
$objectstatic->fetch($line->fk_doc);
//$modulepart = 'expensereport';
- $filename=dol_sanitizeFileName($line->doc_ref);
- $filedir=$conf->expensereport->dir_output . '/' . dol_sanitizeFileName($line->doc_ref);
- $urlsource=$_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+ $filename = dol_sanitizeFileName($line->doc_ref);
+ $filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+ $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
}
else
@@ -969,7 +969,7 @@ while ($i < min($num, $limit))
// Picto + Ref
print '';
- if($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
+ if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
{
print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
print $documentlink;
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 2cb28b59584..bb6f95d9047 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -62,7 +62,7 @@ $search_credit = GETPOST('search_credit', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) { $page = 0; }
$offset = $limit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 91ce9f5e31a..1dfb324599c 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -47,7 +47,7 @@ $socid = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == - 1) {
$page = 0;
} // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index 867f5303ff8..5a5a4d36c21 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -46,7 +46,7 @@ $socid = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == - 1) {
$page = 0;
} // If $page is not defined, or '' or -1
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 847aa3ef47e..bb1f1b8679c 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -54,6 +54,7 @@ class AccountancyExport
public static $EXPORT_TYPE_QUADRATUS = 60;
public static $EXPORT_TYPE_OPENCONCERTO = 100;
public static $EXPORT_TYPE_LDCOMPTA = 110;
+ public static $EXPORT_TYPE_LDCOMPTA10 = 120;
public static $EXPORT_TYPE_FEC = 1000;
@@ -110,8 +111,9 @@ class AccountancyExport
self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'),
self::$EXPORT_TYPE_SAGE50_SWISS => $langs->trans('Modelcsv_Sage50_Swiss'),
self::$EXPORT_TYPE_LDCOMPTA => $langs->trans('Modelcsv_LDCompta'),
+ self::$EXPORT_TYPE_LDCOMPTA10 => $langs->trans('Modelcsv_LDCompta10'),
self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
- self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'),
+ self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'),
);
ksort($listofexporttypes, SORT_NUMERIC);
@@ -140,6 +142,7 @@ class AccountancyExport
self::$EXPORT_TYPE_OPENCONCERTO => 'openconcerto',
self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch',
self::$EXPORT_TYPE_LDCOMPTA => 'ldcompta',
+ self::$EXPORT_TYPE_LDCOMPTA10 => 'ldcompta10',
self::$EXPORT_TYPE_FEC => 'fec',
);
@@ -201,6 +204,10 @@ class AccountancyExport
self::$EXPORT_TYPE_LDCOMPTA => array(
'label' => $langs->trans('Modelcsv_LDCompta'),
'ACCOUNTING_EXPORT_FORMAT' => 'csv',
+ ),
+ self::$EXPORT_TYPE_LDCOMPTA10 => array(
+ 'label' => $langs->trans('Modelcsv_LDCompta10'),
+ 'ACCOUNTING_EXPORT_FORMAT' => 'csv',
),
self::$EXPORT_TYPE_FEC => array(
'label' => $langs->trans('Modelcsv_FEC'),
@@ -280,6 +287,9 @@ class AccountancyExport
case self::$EXPORT_TYPE_LDCOMPTA :
$this->exportLDCompta($TData);
break;
+ case self::$EXPORT_TYPE_LDCOMPTA10 :
+ $this->exportLDCompta10($TData);
+ break;
case self::$EXPORT_TYPE_FEC :
$this->exportFEC($TData);
break;
@@ -921,7 +931,7 @@ class AccountancyExport
/**
* Export format : LD Compta version 9 & higher
- * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW10.pdf
+ * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW9.pdf
*
* @param array $objectLines data
*
@@ -1051,6 +1061,261 @@ class AccountancyExport
}
}
+ /**
+ * Export format : LD Compta version 10 & higher
+ * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW10.pdf
+ *
+ * @param array $objectLines data
+ *
+ * @return void
+ */
+ public function exportLDCompta10($objectLines)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+ $separator = ';';
+ $end_line = "\r\n";
+ $last_codeinvoice = '';
+
+ foreach ($objectLines as $line) {
+ // TYPE C
+ if($last_codeinvoice != $line->doc_ref){
+ //recherche societe en fonction de son code client
+ $sql = "SELECT code_client, fk_forme_juridique, nom, address, zip, town, fk_pays, phone, siret FROM ".MAIN_DB_PREFIX."societe WHERE code_client = '".$line->thirdparty_code ."'";
+ $resql = $this->db->query($sql);
+
+ if($resql && $this->db->num_rows($resql)>0)
+ {
+ $soc = $this->db->fetch_object($resql);
+
+ $address = str_replace(array("\t", "\n", "\r"), " ", $soc->address);
+
+ $type_enregistrement = 'C';
+ print $type_enregistrement.$separator;
+ //NOCL
+ print $soc->code_client.$separator;
+ //NMCM
+ print $separator;
+ //LIBI
+ print $separator;
+ //TITR
+ print getFormeJuridiqueLabel($soc->fk_forme_juridique).$separator;
+ //RSSO
+ print $soc->nom.$separator;
+ //CAD1
+ print substr($address, 0, 40).$separator;
+ //CAD2
+ print substr($address, 41, 40).$separator;
+ //CAD3
+ print substr($address, 82, 40).$separator;
+ //COPO
+ print $soc->zip.$separator;
+ //BUDI
+ print substr($soc->town, 0, 40).$separator;
+ //CPAY
+ print $separator;
+ //PAYS
+ print substr(getCountry($soc->fk_pays), 0, 40).$separator;
+ //NTEL
+ print $soc->phone.$separator;
+ //TLEX
+ print $separator;
+ //TLPO
+ print $separator;
+ //TLCY
+ print $separator;
+ //NINT
+ print $separator;
+ //COMM
+ print $separator;
+ //SIRE
+ print $soc->siret.$separator;
+ //RIBP
+ print $separator;
+ //DOBQ
+ print $separator;
+ //IBBQ
+ print $separator;
+ //COBQ
+ print $separator;
+ //GUBQ
+ print $separator;
+ //CPBQ
+ print $separator;
+ //CLBQ
+ print $separator;
+ //BIBQ
+ print $separator;
+ //MOPM
+ print $separator;
+ //DJPM
+ print $separator;
+ //DMPM
+ print $separator;
+ //REFM
+ print $separator;
+ //SLVA
+ print $separator;
+ //PLCR
+ print $separator;
+ //ECFI
+ print $separator;
+ //CREP
+ print $separator;
+ //NREP
+ print $separator;
+ //TREP
+ print $separator;
+ //MREP
+ print $separator;
+ //GRRE
+ print $separator;
+ //LTTA
+ print $separator;
+ //CACT
+ print $separator;
+ //CODV
+ print $separator;
+ //GRTR
+ print $separator;
+ //NOFP
+ print $separator;
+ //BQAF
+ print $separator;
+ //BONP
+ print $separator;
+ //CESC
+ print $separator;
+
+ print $end_line;
+ }
+ }
+
+ $date_document = dol_print_date($line->doc_date, '%Y%m%d');
+ $date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+ $date_lim_reglement = dol_print_date($line->date_lim_reglement, '%Y%m%d');
+
+ // TYPE E
+ $type_enregistrement = 'E'; // For write movement
+ print $type_enregistrement.$separator;
+ // JNAL
+ print substr($line->code_journal, 0, 2).$separator;
+ // NECR
+ print $line->id.$separator;
+ // NPIE
+ print $line->piece_num.$separator;
+ // DATP
+ print $date_document.$separator;
+ // LIBE
+ print dol_trunc($line->label_operation, 25, 'right', 'UTF-8', 1).$separator;
+ // DATH
+ print $date_lim_reglement.$separator;
+ // CNPI
+ if ($line->doc_type == 'supplier_invoice') {
+ if ($line->montant < 0) {
+ $nature_piece = 'AF';
+ } else {
+ $nature_piece = 'FF';
+ }
+ } elseif ($line->doc_type == 'customer_invoice') {
+ if ($line->montant < 0) {
+ $nature_piece = 'AC';
+ } else {
+ $nature_piece = 'FC';
+ }
+ } else {
+ $nature_piece = '';
+ }
+ print $nature_piece.$separator;
+ // RACI
+ // if (! empty($line->subledger_account)) {
+ // if ($line->doc_type == 'supplier_invoice') {
+ // $racine_subledger_account = '40';
+ // } elseif ($line->doc_type == 'customer_invoice') {
+ // $racine_subledger_account = '41';
+ // } else {
+ // $racine_subledger_account = '';
+ // }
+ // } else {
+ $racine_subledger_account = ''; // for records of type E leave this field blank
+ // }
+
+ print $racine_subledger_account . $separator; // deprecated CPTG & CPTA use instead
+ // MONT
+ print price(abs($line->montant), 0, '', 1, 2).$separator;
+ // CODC
+ print $line->sens.$separator;
+ // CPTG
+ print length_accountg($line->numero_compte).$separator;
+ // DATE
+ print $date_document.$separator;
+ // CLET
+ print $line->lettering_code.$separator;
+ // DATL
+ print $line->date_lettering.$separator;
+ // CPTA
+ if (!empty($line->subledger_account)) {
+ print length_accounta($line->subledger_account).$separator;
+ } else {
+ print $separator;
+ }
+ // CNAT
+ if ($line->doc_type == 'supplier_invoice' && !empty($line->subledger_account)) {
+ print 'F'.$separator;
+ } elseif ($line->doc_type == 'customer_invoice' && !empty($line->subledger_account)) {
+ print 'C'.$separator;
+ } else {
+ print $separator;
+ }
+ // SECT
+ print $separator;
+ // CTRE
+ print $separator;
+ // NORL
+ print $separator;
+ // DATV
+ print $separator;
+ // REFD
+ print $line->doc_ref.$separator;
+ // NECA
+ print '0'.$separator;
+ // CSEC
+ print $separator;
+ // CAFF
+ print $separator;
+ // CDES
+ print $separator;
+ // QTUE
+ print '0'.$separator;
+ // MTDV
+ print $separator;
+ // CODV
+ print '0'.$separator;
+ // TXDV
+ print $separator;
+ // MOPM
+ print $separator;
+ // BONP
+ print $separator;
+ // BQAF
+ print $separator;
+ // ECES
+ print $separator;
+ // TXTL
+ print $separator;
+ // ECRM
+ print $separator;
+ // DATK
+ print $separator;
+ // HEUK
+ print $separator;
+
+ print $end_line;
+
+ $last_codeinvoice = $line->doc_ref;
+ }
+ }
+
/**
* Export format : Charlemagne
*
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 21f7c1cb210..0178f87a32d 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -135,6 +135,11 @@ class AccountingAccount extends CommonObject
*/
public $active;
+ /**
+ * @var int reconciliable
+ */
+ public $reconciliable;
+
/**
* Constructor
*
@@ -162,7 +167,7 @@ class AccountingAccount extends CommonObject
global $conf;
if ($rowid || $account_number) {
- $sql = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active";
+ $sql = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.account_number, a.account_parent, a.label, a.labelshort, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active, a.reconciliable";
$sql .= ", ca.label as category_label";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as a";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as ca ON a.fk_accounting_category = ca.rowid";
@@ -203,6 +208,7 @@ class AccountingAccount extends CommonObject
$this->fk_user_modif = $obj->fk_user_modif;
$this->active = $obj->active;
$this->status = $obj->active;
+ $this->reconciliable = $obj->reconciliable;
return $this->id;
} else {
@@ -261,6 +267,7 @@ class AccountingAccount extends CommonObject
$sql .= ", fk_accounting_category";
$sql .= ", fk_user_author";
$sql .= ", active";
+ $sql .= ", reconciliable";
$sql .= ") VALUES (";
$sql .= " '" . $this->db->idate($now) . "'";
$sql .= ", " . $conf->entity;
@@ -273,6 +280,7 @@ class AccountingAccount extends CommonObject
$sql .= ", " . (empty($this->account_category) ? 0 : (int) $this->account_category);
$sql .= ", " . $user->id;
$sql .= ", " . (int) $this->active;
+ $sql .= ", " . (int) $this->reconciliable;
$sql .= ")";
$this->db->begin();
@@ -340,6 +348,7 @@ class AccountingAccount extends CommonObject
$sql .= " , fk_accounting_category = " . (empty($this->account_category) ? 0 : (int) $this->account_category);
$sql .= " , fk_user_modif = " . $user->id;
$sql .= " , active = " . (int) $this->active;
+ $sql .= " , reconciliable = " . (int) $this->reconciliable;
$sql .= " WHERE rowid = " . $this->id;
dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
@@ -565,21 +574,31 @@ class AccountingAccount extends CommonObject
* Account deactivated
*
* @param int $id Id
+ * @param int $mode 0=field active, 1=field active_customer_list, 2=field_active_supplier_list
* @return int <0 if KO, >0 if OK
*/
- public function account_desactivate($id)
+ public function account_desactivate($id, $mode = 0)
{
// phpcs:enable
$result = $this->checkUsage();
+ if ($mode == 0)
+ {
+ $fieldtouse = 'active';
+ }
+ elseif ($mode == 1)
+ {
+ $fieldtouse = 'reconciliable';
+ }
+
if ($result > 0) {
$this->db->begin();
$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
- $sql .= "SET active = '0'";
+ $sql .= "SET " . $fieldtouse . " = '0'";
$sql .= " WHERE rowid = " . $this->db->escape($id);
- dol_syslog(get_class($this) . "::desactivate sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::account_desactivate " . $fieldtouse . " sql=" . $sql, LOG_DEBUG);
$result = $this->db->query($sql);
if ($result) {
@@ -600,18 +619,28 @@ class AccountingAccount extends CommonObject
* Account activated
*
* @param int $id Id
+ * @param int $mode 0=field active, 1=field reconciliable, 2=field active_customer_list, 3=field_active_supplier_list
* @return int <0 if KO, >0 if OK
*/
- public function account_activate($id)
+ public function account_activate($id, $mode = 0)
{
// phpcs:enable
$this->db->begin();
+ if ($mode == 0)
+ {
+ $fieldtouse = 'active';
+ }
+ elseif ($mode == 1)
+ {
+ $fieldtouse = 'reconciliable';
+ }
+
$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
- $sql .= "SET active = '1'";
+ $sql .= "SET " . $fieldtouse . " = '1'";
$sql .= " WHERE rowid = " . $this->db->escape($id);
- dol_syslog(get_class($this) . "::activate sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::account_activate " . $fieldtouse . " sql=" . $sql, LOG_DEBUG);
$result = $this->db->query($sql);
if ($result) {
$this->db->commit();
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 48df5ce374a..19a5adcca34 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -122,8 +122,8 @@ if ($action == 'validatehistory') {
// Customer Invoice lines (must be same request than into page list.php for manual binding)
$sql = "SELECT f.rowid as facid, f.ref as ref, f.datef, f.type as ftype,";
$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
- $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,";
- $sql .= " p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
+ $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
+ $sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
$sql .= " co.code as country_code, co.label as country_label,";
$sql .= " s.tva_intra";
@@ -154,14 +154,22 @@ if ($action == 'validatehistory') {
$isBuyerInEEC = isInEEC($objp);
- // Search suggested account for product/service
+ // Search suggested account for product/service (similar code exists in page list.php to make manual binding)
$suggestedaccountingaccountfor = '';
if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
$objp->code_sell_p = $objp->code_sell;
$objp->aarowid_suggest = $objp->aarowid;
$suggestedaccountingaccountfor = '';
} else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
+ if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) { // European intravat sale, but with VAT
+ $objp->code_sell_p = $objp->code_sell;
+ $objp->aarowid_suggest = $objp->aarowid;
+ $suggestedaccountingaccountfor = 'eecwithvat';
+ } elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) { // European intravat sale, without VAT intra community number
+ $objp->code_sell_p = $objp->code_sell;
+ $objp->aarowid_suggest = 0; // There is a doubt, no automatic binding
+ $suggestedaccountingaccountfor = 'eecwithoutvatnumber';
+ } elseif ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
$objp->code_sell_p = $objp->code_sell_intra;
$objp->aarowid_suggest = $objp->aarowid_intra;
$suggestedaccountingaccountfor = 'eec';
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index d52c4c51f07..55342a98c27 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -60,7 +60,7 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) $page = 0;
$pageprev = $page - 1;
$pagenext = $page + 1;
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index d964d348889..9e4f73d8f7a 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -69,7 +69,7 @@ $btn_ventil = GETPOST('ventil', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) { $page = 0; }
$offset = $limit * $page;
$pageprev = $page - 1;
@@ -206,8 +206,10 @@ if (empty($chartaccountcode))
// Customer Invoice lines
$sql = "SELECT f.rowid as facid, f.ref as ref, f.datef, f.type as ftype,";
$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
-$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,";
-$sql .= " p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
+$sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
+$sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export,";
+$sql .= " p.tosell as status, p.tobuy as status_buy,";
$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
$sql .= " co.code as country_code, co.label as country_label,";
$sql .= " s.tva_intra";
@@ -399,7 +401,7 @@ if ($result) {
print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
+ print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
$checkpicto = '';
if ($massactionbutton) $checkpicto = $form->showCheckAddButtons('checkforselect', 1);
@@ -423,6 +425,14 @@ if ($result) {
$product_static->id = $objp->product_id;
$product_static->type = $objp->type;
$product_static->label = $objp->product_label;
+ $product_static->status = $objp->status;
+ $product_static->status_buy = $objp->status_buy;
+ $product_static->accountancy_code_sell = $objp->code_sell;
+ $product_static->accountancy_code_sell_intra = $objp->code_sell_intra;
+ $product_static->accountancy_code_sell_export = $objp->code_sell_export;
+ $product_static->accountancy_code_buy = $objp->code_buy;
+ $product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
+ $product_static->accountancy_code_buy_export = $objp->code_buy_export;
$facture_static->ref = $objp->ref;
$facture_static->id = $objp->facid;
@@ -433,13 +443,20 @@ if ($result) {
$isBuyerInEEC = isInEEC($objp);
+ // Search suggested default account for product/service
$suggestedaccountingaccountbydefaultfor = '';
if ($objp->type_l == 1) {
if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
$suggestedaccountingaccountbydefaultfor = '';
} else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
+ if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) { // European intravat sale, but with a VAT
+ $objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'eecwithvat';
+ } elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) { // European intravat sale, without VAT intra community number
+ $objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
+ } elseif ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : '');
$suggestedaccountingaccountbydefaultfor = 'eec';
} else { // Foreign sale
@@ -452,7 +469,13 @@ if ($result) {
$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
$suggestedaccountingaccountbydefaultfor = '';
} else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
+ if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) { // European intravat sale, but with a VAT
+ $objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'eecwithvat';
+ } elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) { // European intravat sale, without VAT intra community number
+ $objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
+ } elseif ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : '');
$suggestedaccountingaccountbydefaultfor = 'eec';
} else {
@@ -463,14 +486,22 @@ if ($result) {
}
if ($objp->code_sell_l == -1) $objp->code_sell_l = '';
- // Search suggested account for product/service
+ // Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
$suggestedaccountingaccountfor = '';
if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
$objp->code_sell_p = $objp->code_sell;
$objp->aarowid_suggest = $objp->aarowid;
$suggestedaccountingaccountfor = '';
} else {
- if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
+ if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) { // European intravat sale, but with VAT
+ $objp->code_sell_p = $objp->code_sell;
+ $objp->aarowid_suggest = $objp->aarowid;
+ $suggestedaccountingaccountfor = 'eecwithvat';
+ } elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) { // European intravat sale, without VAT intra community number
+ $objp->code_sell_p = $objp->code_sell;
+ $objp->aarowid_suggest = $objp->aarowid; // There is a doubt for this case. Is it an error on vat or we just forgot to fill vat number ?
+ $suggestedaccountingaccountfor = 'eecwithoutvatnumber';
+ } elseif ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
$objp->code_sell_p = $objp->code_sell_intra;
$objp->aarowid_suggest = $objp->aarowid_intra;
$suggestedaccountingaccountfor = 'eec';
@@ -487,6 +518,7 @@ if ($result) {
$code_sell_p_notset = 'color:orange';
}
if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) $code_sell_p_notset = 'color:red';
+ if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber' && empty($code_sell_p_notset)) $code_sell_p_notset = 'color:orange';
// $objp->code_sell_l is now default code of product/service
// $objp->code_sell_p is now code of product/service
@@ -503,9 +535,10 @@ if ($result) {
// Ref Product
print ' ';
- if ($product_static->id > 0)
+ if ($product_static->id > 0) {
print $product_static->getNomUrl(1);
- if ($objp->product_label) print ''.$objp->product_label.' ';
print ' ';
print '';
@@ -535,7 +568,7 @@ if ($result) {
// Current account
print ' ';
- $s = (($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
+ $s = ''.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
$shelp = '';
if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
@@ -544,9 +577,11 @@ if ($result) {
if ($objp->product_id > 0)
{
print ''.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
$shelp = '';
if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
+ elseif ($suggestedaccountingaccountfor == 'eecwithvat') $shelp = $langs->trans("SaleEECWithVAT");
+ elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $shelp = $langs->trans("SaleEECWithoutVATNumber");
elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
$s .= (empty($objp->code_sell_p) ? $langs->trans("NotDefined") : length_accountg($objp->code_sell_p));
print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
@@ -582,6 +617,7 @@ if ($result) {
print ' ';
//var_dump($objp->aarowid);var_dump($objp->aarowid_intra);var_dump($objp->aarowid_export);var_dump($objp->aarowid_suggest);
$ischecked = $objp->aarowid_suggest;
+ if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $ischecked = 0;
print ' ';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index cc606555b37..63b142e1bdd 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -55,7 +55,7 @@ $search_year = GETPOST("search_year", "int");
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) $page = 0;
$pageprev = $page - 1;
$pagenext = $page + 1;
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index c0d9d1a03b5..e03c717039f 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -62,7 +62,7 @@ $search_year = GETPOST("search_year", "int");
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) { $page = 0; }
$offset = $limit * $page;
$pageprev = $page - 1;
@@ -313,8 +313,8 @@ if ($result) {
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right maxwidth50 ');
print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
- print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', $sortfield, $sortorder, 'center ');
- print_liste_field_titre("IntoAccount", '', '', '', '', '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
+ print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', '');
$checkpicto = '';
if ($massactionbutton) $checkpicto = $form->showCheckAddButtons('checkforselect', 1);
print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
@@ -366,12 +366,12 @@ if ($result) {
print '';
// Current account
- print '';
+ print ' ';
print length_accountg(html_entity_decode($objp->code_buy));
print ' ';
// Suggested accounting account
- print '';
+ print ' ';
print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
print ' ';
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 71fce0be43a..ec193b2922a 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -66,7 +66,7 @@ if ($conf->accounting->enabled)
$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
- $helpisexpanded = empty($resultboxes['boxactivated']); // If there is no widget, the tooltip help is expanded by default.
+ $helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
$showtutorial = '';
if (!$helpisexpanded)
@@ -222,10 +222,6 @@ if ($conf->accounting->enabled)
$boxlist .= '';
$boxlist .= '
';
- if (!empty($nbworkboardcount))
- {
- $boxlist .= $boxwork;
- }
$boxlist .= $resultboxes['boxlista'];
@@ -233,7 +229,6 @@ if ($conf->accounting->enabled)
$boxlist .= '
';
- $boxlist .= $boxstat;
$boxlist .= $resultboxes['boxlistb'];
$boxlist .= '
';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 3bc44698029..07877378ce1 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -1,7 +1,7 @@
* Copyright (C) 2013-2014 Florian Henry
- * Copyright (C) 2013-2015 Alexandre Spangaro
+ * Copyright (C) 2013-2020 Alexandre Spangaro
* Copyright (C) 2014 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
@@ -119,8 +119,9 @@ if ($action == 'validatehistory') {
// Supplier Invoice Lines (must be same request than into page list.php for manual binding)
$sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.type as ftype,";
$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
- $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod,";
- $sql .= " aa.rowid as aarowid,";
+ $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
+ $sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export, p.tva_tx as tva_tx_prod,";
+ $sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
$sql .= " co.code as country_code, co.label as country_label,";
$sql .= " s.tva_intra";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -128,7 +129,9 @@ if ($action == 'validatehistory') {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.active = 1 AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.active = 1 AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number AND aa2.active = 1 AND aa2.fk_pcg_version = '".$chartaccountcode."' AND aa2.entity = ".$conf->entity;
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$chartaccountcode."' AND aa3.entity = ".$conf->entity;
$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
$sql .= " AND l.product_type <= 2";
@@ -157,16 +160,12 @@ if ($action == 'validatehistory') {
$suggestedaccountingaccountfor = '';
} else {
if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
- //$objp->code_buy_p = $objp->code_buy_intra;
- $objp->code_buy_p = $objp->code_buy;
- //$objp->aarowid_suggest = $objp->aarowid_intra;
- $objp->aarowid_suggest = $objp->aarowid;
+ $objp->code_buy_p = $objp->code_buy_intra;
+ $objp->aarowid_suggest = $objp->aarowid_intra;
$suggestedaccountingaccountfor = 'eec';
} else { // Foreign sale
- //$objp->code_buy_p = $objp->code_buy_export;
- $objp->code_buy_p = $objp->code_buy;
- //$objp->aarowid_suggest = $objp->aarowid_export;
- $objp->aarowid_suggest = $objp->aarowid;
+ $objp->code_buy_p = $objp->code_buy_export;
+ $objp->aarowid_suggest = $objp->aarowid_export;
$suggestedaccountingaccountfor = 'export';
}
}
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index a035aed2b1f..ef44222568f 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -62,7 +62,7 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) $page = 0;
$offset = $limit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index ecd41f2f9da..b6c220c347a 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2013-2017 Alexandre Spangaro
+ * Copyright (C) 2013-2020 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2013-2014 Florian Henry
* Copyright (C) 2014 Juanjo Menent s
@@ -69,7 +69,7 @@ $btn_ventil = GETPOST('ventil', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page < 0) { $page = 0; }
$offset = $limit * $page;
$pageprev = $page - 1;
@@ -210,8 +210,11 @@ if (empty($chartaccountcode))
// Supplier Invoice Lines
$sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.type as ftype,";
$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
-$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod,";
-$sql .= " aa.rowid as aarowid,";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
+$sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
+$sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export,";
+$sql .= " p.tosell as status, p.tobuy as status_buy,";
+$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
$sql .= " co.code as country_code, co.label as country_label,";
$sql .= " s.tva_intra";
$parameters = array();
@@ -222,7 +225,9 @@ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.active = 1 AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON p.accountancy_code_sell = aa.account_number AND aa.active = 1 AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number AND aa2.active = 1 AND aa2.fk_pcg_version = '".$chartaccountcode."' AND aa2.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$chartaccountcode."' AND aa3.entity = ".$conf->entity;
$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
$sql .= " AND l.product_type <= 2";
// Add search filter like
@@ -396,7 +401,7 @@ if ($result) {
print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
- print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'center ');
+ print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
$checkpicto = '';
if ($massactionbutton) $checkpicto = $form->showCheckAddButtons('checkforselect', 1);
@@ -414,40 +419,86 @@ if ($result) {
// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
$objp->code_buy_l = '';
$objp->code_buy_p = '';
- $objp->aarowid_suggest = '';
$product_static->ref = $objp->product_ref;
$product_static->id = $objp->product_id;
$product_static->type = $objp->type;
$product_static->label = $objp->product_label;
+ $product_static->status = $objp->status;
+ $product_static->status_buy = $objp->status_buy;
+ $product_static->accountancy_code_sell = $objp->code_sell;
+ $product_static->accountancy_code_sell_intra = $objp->code_sell_intra;
+ $product_static->accountancy_code_sell_export = $objp->code_sell_export;
+ $product_static->accountancy_code_buy = $objp->code_buy;
+ $product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
+ $product_static->accountancy_code_buy_export = $objp->code_buy_export;
$facturefourn_static->ref = $objp->ref;
$facturefourn_static->id = $objp->facid;
$facturefourn_static->type = $objp->type;
$code_buy_p_notset = '';
- $objp->aarowid_suggest = $objp->aarowid;
+ $objp->aarowid_suggest = ''; // Will be set later
+ $isBuyerInEEC = isInEEC($objp);
+
+ $suggestedaccountingaccountbydefaultfor = '';
if ($objp->type_l == 1) {
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : '');
- if ($objp->aarowid == '')
- $objp->aarowid_suggest = $aarowid_s;
+ if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
+ $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = '';
+ } else {
+ if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
+ $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'eec';
+ } else { // Foreign sale
+ $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'export';
+ }
+ }
} elseif ($objp->type_l == 0) {
- $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : '');
- if ($objp->aarowid == '')
- $objp->aarowid_suggest = $aarowid_p;
+ if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
+ $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = '';
+ } else {
+ if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
+ $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'eec';
+ } else {
+ $objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : '');
+ $suggestedaccountingaccountbydefaultfor = 'export';
+ }
+ }
}
- if ($objp->code_buy_l == -1) $objp->code_buy_l = '';
+ if ($objp->code_sell_l == -1) $objp->code_sell_l = '';
- if (!empty($objp->code_buy)) {
- $objp->code_buy_p = $objp->code_buy; // Code on product
+ // Search suggested account for product/service
+ $suggestedaccountingaccountfor = '';
+ if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
+ $objp->code_buy_p = $objp->code_buy;
+ $objp->aarowid_suggest = $objp->aarowid;
+ $suggestedaccountingaccountfor = '';
+ } else {
+ if ($isSellerInEEC && $isBuyerInEEC) { // European intravat sale
+ $objp->code_buy_p = $objp->code_buy_intra;
+ $objp->aarowid_suggest = $objp->aarowid_intra;
+ $suggestedaccountingaccountfor = 'eec';
+ } else { // Foreign sale
+ $objp->code_buy_p = $objp->code_buy_export;
+ $objp->aarowid_suggest = $objp->aarowid_export;
+ $suggestedaccountingaccountfor = 'export';
+ }
+ }
+
+ if (!empty($objp->code_buy_p)) {
+ // Value was defined previously
} else {
$code_buy_p_notset = 'color:orange';
}
if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) $code_buy_p_notset = 'color:red';
- // $objp->code_buy_p is now code of product/service
// $objp->code_buy_l is now default code of product/service
+ // $objp->code_buy_p is now code of product/service
print '';
@@ -467,7 +518,7 @@ if ($result) {
print '';
if ($product_static->id > 0)
print $product_static->getNomUrl(1);
- if ($objp->product_label) print ''.$objp->product_label.' ';
print ' ';
// Description
@@ -498,8 +549,8 @@ if ($result) {
print ''.$objp->tva_intra.' ';
// Current account
- print '';
- $s = (($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
+ print ' ';
+ $s = ''.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
$shelp = '';
if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
@@ -508,7 +559,7 @@ if ($result) {
if ($objp->product_id > 0)
{
print ''.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
$shelp = '';
if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
@@ -520,6 +571,21 @@ if ($result) {
// Suggested accounting account
print ' ';
$suggestedid = $objp->aarowid_suggest;
+ if (empty($suggestedid) && empty($objp->code_buy_p) && !empty($objp->code_buy_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC))
+ {
+ if (empty($accountingaccount_codetotid_cache[$objp->code_buy_l]))
+ {
+ $tmpaccount = new AccountingAccount($db);
+ $tmpaccount->fetch(0, $objp->code_buy_l, 1);
+ if ($tmpaccount->id > 0) {
+ $suggestedid = $tmpaccount->id;
+ }
+ $accountingaccount_codetotid_cache[$objp->code_buy_l] = $tmpaccount->id;
+ }
+ else {
+ $suggestedid = $accountingaccount_codetotid_cache[$objp->code_buy_l];
+ }
+ }
print $formaccounting->select_account($suggestedid, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
print ' ';
@@ -540,6 +606,9 @@ if ($result) {
} else {
print $db->error();
}
+if ($db->type == 'mysqli') {
+ $db->query("SET SQL_BIG_SELECTS=0"); // Enable MAX_JOIN_SIZE limitation
+}
// Add code to auto check the box when we select an account
print ''."\n";
}
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Build a graph using Chart library. Input when calling this method should be:
+ * $this->data = array(array(0=>'labelxA',1=>yA), array('labelxB',yB));
+ * $this->data = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn)); // or when there is n series to show for each x
+ * $this->data = array(array('label'=>'labelxA','data'=>yA), array('labelxB',yB)); // Syntax deprecated
+ * $this->legend= array("Val1",...,"Valn"); // list of n series name
+ * $this->type = array('bars',...'lines', 'linesnopoint'); or array('pie') or array('polar') or array('piesemicircle');
+ * $this->mode = 'depth' ???
+ * $this->bgcolorgrid
+ * $this->datacolor
+ * $this->shownodatagraph
+ *
+ * @param string $file Image file name to use to save onto disk (also used as javascript unique id)
+ * @param string $fileurl Url path to show image if saved onto disk. Never used here.
+ * @return void
+ */
+ private function draw_chart($file, $fileurl)
+ {
+ // phpcs:enable
+ global $conf, $langs;
+
+ dol_syslog(get_class($this)."::draw_chart this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
+
+ if (empty($this->width) && empty($this->height))
+ {
+ print 'Error width or height not set';
+ return;
+ }
+
+ $showlegend = $this->showlegend;
+
+ $legends = array();
+ $nblot = 0;
+ if (is_array($this->data)) {
+ foreach ($this->data as $valarray) // Loop on each x
+ {
+ $nblot = max($nblot, count($valarray) - 1); // -1 to remove legend
+ }
+ }
+ //var_dump($nblot);
+ if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+ $firstlot = 0;
+ // Works with line but not with bars
+ //if ($nblot > 2) $firstlot = ($nblot - 2); // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
+
+ $serie = array(); $arrayofgroupslegend = array();
+ //var_dump($this->data);
+
+ $i = $firstlot;
+ while ($i < $nblot) // Loop on each serie
+ {
+ $values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x (with x=0,1,2,...)
+ $serie[$i] = "";
+
+ // Fill array $values
+ $x = 0;
+ foreach ($this->data as $valarray) // Loop on each x
+ {
+ $legends[$x] = (array_key_exists('label', $valarray) ? $valarray['label'] : $valarray[0]);
+ $array_of_ykeys = array_keys($valarray);
+ $alabelexists = 1;
+ $tmpykey = explode('_', ($array_of_ykeys[$i + ($alabelexists ? 1 : 0)]), 3);
+ if (!empty($tmpykey[2]) || $tmpykey[2] == '0') { // This is a 'Group by' array
+ $tmpvalue = (array_key_exists('y_'.$tmpykey[1].'_'.$tmpykey[2], $valarray) ? $valarray['y_'.$tmpykey[1].'_'.$tmpykey[2]] : $valarray[$i + 1]);
+ $values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
+ $arrayofgroupslegend[$i] = array(
+ 'stacknum'=> $tmpykey[1],
+ 'legend' => $this->Legend[$tmpykey[1]],
+ 'legendwithgroup' => $this->Legend[$tmpykey[1]].' - '.$tmpykey[2]
+ );
+ } else {
+ $tmpvalue = (array_key_exists('y_'.$i, $valarray) ? $valarray['y_'.$i] : $valarray[$i + 1]);
+ //var_dump($i.'_'.$x.'_'.$tmpvalue);
+ $values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
+ }
+ $x++;
+ }
+ //var_dump($values);
+ $j = 0;
+ foreach ($values as $x => $y) {
+ if (isset($y)) {
+ $serie[$i] .= ($j > 0 ? ", " : "").$y;
+ } else {
+ $serie[$i] .= ($j > 0 ? ", " : "").'null';
+ }
+ $j++;
+ }
+
+ $values = null; // Free mem
+ $i++;
+ }
+ //var_dump($serie);
+ //var_dump($arrayofgroupslegend);
+
+ $tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
+
+ $this->stringtoshow = ''."\n";
+ if (!empty($this->title)) $this->stringtoshow .= ''.$this->title.'
';
+ if (!empty($this->shownographyet))
+ {
+ $this->stringtoshow .= '
';
+ $this->stringtoshow .= ''.$langs->trans("NotEnoughDataYet").'...
';
+ return;
+ }
+
+ // Start the div that will contains all the graph
+ $dolxaxisvertical='';
+ if (count($this->data) > 20) $dolxaxisvertical='dol-xaxis-vertical';
+ // No height for the pie grah
+ $cssfordiv = 'dolgraphchart';
+ if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar'.$this->type[$firstlot];
+ $this->stringtoshow .= '
'."\n";
+
+ $this->stringtoshow .= ''."\n";
+ }
+
+
/**
* Output HTML string to total value
*
@@ -1159,11 +1313,11 @@ class DolGraph
if ($shownographyet)
{
$s = '
';
- $s .= '';
+ $s .= '
';
if (is_numeric($shownographyet)) {
- $s .= $langs->trans("NotEnoughDataYet");
+ $s .= $langs->trans("NotEnoughDataYet").'...';
} else {
- $s .= $shownographyet;
+ $s .= $shownographyet.'...';
}
$s .= '
';
return $s;
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
new file mode 100644
index 00000000000..a520ebb3a21
--- /dev/null
+++ b/htdocs/core/class/evalmath.class.php
@@ -0,0 +1,507 @@
+
+ *
+ * ================================================================================
+ *
+ * NAME
+ * EvalMath - safely evaluate math expressions
+ *
+ * SYNOPSIS
+ * include('evalmath.class.php');
+ * $m = new EvalMath;
+ * // basic evaluation:
+ * $result = $m->evaluate('2+2');
+ * // supports: order of operation; parentheses; negation; built-in functions
+ * $result = $m->evaluate('-8(5/2)^2*(1-sqrt(4))-8');
+ * // create your own variables
+ * $m->evaluate('a = e^(ln(pi))');
+ * // or functions
+ * $m->evaluate('f(x,y) = x^2 + y^2 - 2x*y + 1');
+ * // and then use them
+ * $result = $m->evaluate('3*f(42,a)');
+ *
+ * DESCRIPTION
+ * Use the EvalMath class when you want to evaluate mathematical expressions
+ * from untrusted sources. You can define your own variables and functions,
+ * which are stored in the object. Try it, it's fun!
+ *
+ * METHODS
+ * $m->evalute($expr)
+ * Evaluates the expression and returns the result. If an error occurs,
+ * prints a warning and returns false. If $expr is a function assignment,
+ * returns true on success.
+ *
+ * $m->e($expr)
+ * A synonym for $m->evaluate().
+ *
+ * $m->vars()
+ * Returns an associative array of all user-defined variables and values.
+ *
+ * $m->funcs()
+ * Returns an array of all user-defined functions.
+ *
+ * PARAMETERS
+ * $m->suppress_errors
+ * Set to true to turn off warnings when evaluating expressions
+ *
+ * $m->last_error
+ * If the last evaluation failed, contains a string describing the error.
+ * (Useful when suppress_errors is on).
+ *
+ * $m->last_error_code
+ * If the last evaluation failed, 2 element array with numeric code and extra info
+ *
+ * AUTHOR INFORMATION
+ * Copyright 2005, Miles Kaufmann.
+ *
+ * LICENSE
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1 Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file core/class/evalmath.class.php
+ * \ingroup core
+ * \brief This file for Math evaluation
+ */
+
+/**
+ * Class EvalMath
+ */
+class EvalMath
+{
+
+ public $suppress_errors = false;
+
+ public $last_error = null;
+
+ public $last_error_code = null;
+
+ public $v = array('e' => 2.71,'pi' => 3.14159);
+
+ // variables (and constants)
+ public $f = array();
+
+ // user-defined functions
+ public $vb = array('e','pi');
+
+ // constants
+ public $fb = array( // built-in functions
+ 'sin','sinh','arcsin','asin','arcsinh','asinh','cos','cosh','arccos','acos','arccosh','acosh','tan','tanh','arctan','atan','arctanh','atanh','sqrt','abs','ln','log','intval');
+
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ // make the variables a little more accurate
+ $this->v['pi'] = pi();
+ $this->v['e'] = exp(1);
+ }
+
+ /**
+ * Evaluate
+ *
+ * @param string $expr String
+ * @return boolean|number|NULL|mixed Result
+ */
+ public function e($expr)
+ {
+ return $this->evaluate($expr);
+ }
+
+ /**
+ * Evaluate
+ *
+ * @param string $expr String
+ * @return boolean|number|NULL|mixed Result
+ */
+ public function evaluate($expr)
+ {
+ $this->last_error = null;
+ $this->last_error_code = null;
+ $expr = trim($expr);
+ if (substr($expr, - 1, 1) == ';')
+ $expr = substr($expr, 0, strlen($expr) - 1); // strip semicolons at the end
+ // ===============
+ // is it a variable assignment?
+ $matches = array();
+ if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) {
+ if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant
+ return $this->trigger(1, "cannot assign to constant '$matches[1]'", $matches[1]);
+ }
+ if (($tmp = $this->pfx($this->nfx($matches[2]))) === false)
+ return false; // get the result and make sure it's good
+ $this->v[$matches[1]] = $tmp; // if so, stick it in the variable array
+ return $this->v[$matches[1]]; // and return the resulting value
+ // ===============
+ // is it a function assignment?
+ } elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) {
+ $fnn = $matches[1]; // get the function name
+ if (in_array($matches[1], $this->fb)) { // make sure it isn't built in
+ return $this->trigger(2, "cannot redefine built-in function '$matches[1]()'", $matches[1]);
+ }
+ $args = explode(",", preg_replace("/\s+/", "", $matches[2])); // get the arguments
+ if (($stack = $this->nfx($matches[3])) === false)
+ return false; // see if it can be converted to postfix
+ $nbstack = count($stack);
+ for ($i = 0; $i < $nbstack; $i ++) { // freeze the state of the non-argument variables
+ $token = $stack[$i];
+ if (preg_match('/^[a-z]\w*$/', $token) and ! in_array($token, $args)) {
+ if (array_key_exists($token, $this->v)) {
+ $stack[$i] = $this->v[$token];
+ } else {
+ return $this->trigger(3, "undefined variable '$token' in function definition", $token);
+ }
+ }
+ }
+ $this->f[$fnn] = array('args' => $args,'func' => $stack);
+ return true;
+ // ===============
+ } else {
+ return $this->pfx($this->nfx($expr)); // straight up evaluation, woo
+ }
+ }
+
+ /**
+ * vars
+ *
+ * @return string Output
+ */
+ private function vars()
+ {
+ $output = $this->v;
+ unset($output['pi']);
+ unset($output['e']);
+ return $output;
+ }
+
+ /**
+ * vars
+ *
+ * @return string Output
+ */
+ private function funcs()
+ {
+ $output = array();
+ foreach ($this->f as $fnn => $dat)
+ $output[] = $fnn . '(' . implode(',', $dat['args']) . ')';
+ return $output;
+ }
+
+ // ===================== HERE BE INTERNAL METHODS ====================\\
+
+ /**
+ * Convert infix to postfix notation
+ *
+ * @param string $expr Expression
+ * @return string Output
+ */
+ private function nfx($expr)
+ {
+ $index = 0;
+ $stack = new EvalMathStack();
+ $output = array(); // postfix form of expression, to be passed to pfx()
+ $expr = trim(strtolower($expr));
+
+ $ops = array('+','-','*','/','^','_');
+ $ops_r = array('+' => 0,'-' => 0,'*' => 0,'/' => 0,'^' => 1); // right-associative operator?
+ $ops_p = array('+' => 0,'-' => 0,'*' => 1,'/' => 1,'_' => 1,'^' => 2); // operator precedence
+
+ $expecting_op = false; // we use this in syntax-checking the expression
+ // and determining when a - is a negation
+
+ $matches = array();
+ if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good
+ return $this->trigger(4, "illegal character '{$matches[0]}'", $matches[0]);
+ }
+
+ while (1) { // 1 Infinite Loop ;)
+ $op = substr($expr, $index, 1); // get the first character at the current index
+ // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
+ $match = array();
+ $ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match);
+ // ===============
+ if ($op == '-' and ! $expecting_op) { // is it a negation instead of a minus?
+ $stack->push('_'); // put a negation on the stack
+ $index ++;
+ } elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack
+ return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression
+ // ===============
+ } elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack?
+ if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis?
+ $op = '*';
+ $index --; // it's an implicit multiplication
+ }
+ // heart of the algorithm:
+ while ($stack->count > 0 and ($o2 = $stack->last()) and in_array($o2, $ops) and ($ops_r[$op] ? $ops_p[$op] < $ops_p[$o2] : $ops_p[$op] <= $ops_p[$o2])) {
+ $output[] = $stack->pop(); // pop stuff off the stack into the output
+ }
+ // many thanks: http://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail
+ $stack->push($op); // finally put OUR operator onto the stack
+ $index ++;
+ $expecting_op = false;
+ // ===============
+ } elseif ($op == ')' and $expecting_op) { // ready to close a parenthesis?
+ while (($o2 = $stack->pop()) != '(') { // pop off the stack back to the last (
+ if (is_null($o2))
+ return $this->trigger(5, "unexpected ')'", ")");
+ else
+ $output[] = $o2;
+ }
+ if (preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) { // did we just close a function?
+ $fnn = $matches[1]; // get the function name
+ $arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you)
+ $output[] = $stack->pop(); // pop the function and push onto the output
+ if (in_array($fnn, $this->fb)) { // check the argument count
+ if ($arg_count > 1)
+ return $this->trigger(6, "wrong number of arguments ($arg_count given, 1 expected)", array($arg_count,1));
+ } elseif (array_key_exists($fnn, $this->f)) {
+ if ($arg_count != count($this->f[$fnn]['args']))
+ return $this->trigger(6, "wrong number of arguments ($arg_count given, " . count($this->f[$fnn]['args']) . " expected)", array($arg_count,count($this->f[$fnn]['args'])));
+ } else { // did we somehow push a non-function on the stack? this should never happen
+ return $this->trigger(7, "internal error");
+ }
+ }
+ $index ++;
+ // ===============
+ } elseif ($op == ',' and $expecting_op) { // did we just finish a function argument?
+ while (($o2 = $stack->pop()) != '(') {
+ if (is_null($o2))
+ return $this->trigger(5, "unexpected ','", ","); // oops, never had a (
+ else
+ $output[] = $o2; // pop the argument expression stuff and push onto the output
+ }
+ // make sure there was a function
+ if (! preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches))
+ return $this->trigger(5, "unexpected ','", ",");
+ $stack->push($stack->pop() + 1); // increment the argument count
+ $stack->push('('); // put the ( back on, we'll need to pop back to it again
+ $index ++;
+ $expecting_op = false;
+ // ===============
+ } elseif ($op == '(' and ! $expecting_op) {
+ $stack->push('('); // that was easy
+ $index ++;
+ $allow_neg = true;
+ // ===============
+ } elseif ($ex and ! $expecting_op) { // do we now have a function/variable/number?
+ $expecting_op = true;
+ $val = $match[1];
+ if (preg_match("/^([a-z]\w*)\($/", $val, $matches)) { // may be func, or variable w/ implicit multiplication against parentheses...
+ if (in_array($matches[1], $this->fb) or array_key_exists($matches[1], $this->f)) { // it's a func
+ $stack->push($val);
+ $stack->push(1);
+ $stack->push('(');
+ $expecting_op = false;
+ } else { // it's a var w/ implicit multiplication
+ $val = $matches[1];
+ $output[] = $val;
+ }
+ } else { // it's a plain old var or num
+ $output[] = $val;
+ }
+ $index += strlen($val);
+ // ===============
+ } elseif ($op == ')') { // miscellaneous error checking
+ return $this->trigger(5, "unexpected ')'", ")");
+ } elseif (in_array($op, $ops) and ! $expecting_op) {
+ return $this->trigger(8, "unexpected operator '$op'", $op);
+ } else { // I don't even want to know what you did to get here
+ return $this->trigger(9, "an unexpected error occured");
+ }
+ if ($index == strlen($expr)) {
+ if (in_array($op, $ops)) { // did we end with an operator? bad.
+ return $this->trigger(10, "operator '$op' lacks operand", $op);
+ } else {
+ break;
+ }
+ }
+ while (substr($expr, $index, 1) == ' ') { // step the index past whitespace (pretty much turns whitespace
+ $index ++; // into implicit multiplication if no operator is there)
+ }
+ }
+ while (! is_null($op = $stack->pop())) { // pop everything off the stack and push onto output
+ if ($op == '(')
+ return $this->trigger(11, "expecting ')'", ")"); // if there are (s on the stack, ()s were unbalanced
+ $output[] = $op;
+ }
+ return $output;
+ }
+
+ /**
+ * evaluate postfix notation
+ *
+ * @param string $tokens Expression
+ * @param array $vars Array
+ * @return string Output
+ */
+ private function pfx($tokens, $vars = array())
+ {
+ if ($tokens == false)
+ return false;
+
+ $stack = new EvalMathStack();
+
+ foreach ($tokens as $token) { // nice and easy
+ // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
+ $matches = array();
+ if (in_array($token, array('+','-','*','/','^'))) {
+ if (is_null($op2 = $stack->pop()))
+ return $this->trigger(12, "internal error");
+ if (is_null($op1 = $stack->pop()))
+ return $this->trigger(13, "internal error");
+ switch ($token) {
+ case '+':
+ $stack->push($op1 + $op2);
+ break;
+ case '-':
+ $stack->push($op1 - $op2);
+ break;
+ case '*':
+ $stack->push($op1 * $op2);
+ break;
+ case '/':
+ if ($op2 == 0)
+ return $this->trigger(14, "division by zero");
+ $stack->push($op1 / $op2);
+ break;
+ case '^':
+ $stack->push(pow($op1, $op2));
+ break;
+ }
+ // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
+ } elseif ($token == "_") {
+ $stack->push(- 1 * $stack->pop());
+ // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
+ } elseif (preg_match("/^([a-z]\w*)\($/", $token, $matches)) { // it's a function!
+ $fnn = $matches[1];
+ if (in_array($fnn, $this->fb)) { // built-in function:
+ if (is_null($op1 = $stack->pop()))
+ return $this->trigger(15, "internal error");
+ $fnn = preg_replace("/^arc/", "a", $fnn); // for the 'arc' trig synonyms
+ if ($fnn == 'ln')
+ $fnn = 'log';
+ eval('$stack->push(' . $fnn . '($op1));'); // perfectly safe eval()
+ } elseif (array_key_exists($fnn, $this->f)) { // user function
+ // get args
+ $args = array();
+ for ($i = count($this->f[$fnn]['args']) - 1; $i >= 0; $i --) {
+ if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop()))
+ return $this->trigger(16, "internal error");
+ }
+ $stack->push($this->pfx($this->f[$fnn]['func'], $args)); // yay... recursion!!!!
+ }
+ // if the token is a number or variable, push it on the stack
+ } else {
+ if (is_numeric($token)) {
+ $stack->push($token);
+ } elseif (array_key_exists($token, $this->v)) {
+ $stack->push($this->v[$token]);
+ } elseif (array_key_exists($token, $vars)) {
+ $stack->push($vars[$token]);
+ } else {
+ return $this->trigger(17, "undefined variable '$token'", $token);
+ }
+ }
+ }
+ // when we're out of tokens, the stack should have a single element, the final result
+ if ($stack->count != 1)
+ return $this->trigger(18, "internal error");
+ return $stack->pop();
+ }
+
+ /**
+ * trigger an error, but nicely, if need be
+ *
+ * @param string $code Code
+ * @param string $msg Msg
+ * @param string|null $info String
+ * @return boolean False
+ */
+ public function trigger($code, $msg, $info = null)
+ {
+ $this->last_error = $msg;
+ $this->last_error_code = array($code,$info);
+ if (! $this->suppress_errors)
+ trigger_error($msg, E_USER_WARNING);
+ return false;
+ }
+}
+
+/**
+ * Class for internal use
+ */
+class EvalMathStack
+{
+
+ public $stack = array();
+
+ public $count = 0;
+
+ /**
+ * push
+ *
+ * @param string $val Val
+ * @return void
+ */
+ public function push($val)
+ {
+ $this->stack[$this->count] = $val;
+ $this->count ++;
+ }
+
+ /**
+ * pop
+ *
+ * @return mixed Stack
+ */
+ public function pop()
+ {
+ if ($this->count > 0) {
+ $this->count --;
+ return $this->stack[$this->count];
+ }
+ return null;
+ }
+
+ /**
+ * last
+ *
+ * @param int $n N
+ * @return mixed Stack
+ */
+ public function last($n = 1)
+ {
+ if (isset($this->stack[$this->count - $n])) {
+ return $this->stack[$this->count - $n];
+ }
+ return;
+ }
+}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b31607c1d60..02b8529257d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -202,7 +202,7 @@ class Form
$ret .= '
';
if (empty($notabletag)) $ret .= '
';
if (empty($notabletag)) $ret .= '';
- if (preg_match('/^(string|email)/', $typeofdata))
+ if (preg_match('/^(string|safehtmlstring|email)/', $typeofdata))
{
$tmp = explode(':', $typeofdata);
$ret .= 'f ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
@@ -3507,7 +3508,7 @@ class Form
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return list of payment methods
- * Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value but scope is all application, probably not what you want.
+ * Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value but scope is all application, probably not what you want.
*
* @param string $selected Id du mode de paiement pre-selectionne
* @param string $htmlname Nom de la zone select
@@ -5268,8 +5269,9 @@ class Form
$disabled = false; $title = '';
if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0")
{
- // Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses
- if (empty($conf->global->OVERRIDE_VAT_FOR_EXPENSE_REPORT))
+ // Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses instead
+ // of using supplier invoices (this is a very bad idea !)
+ if (empty($conf->global->EXPENSEREPORT_OVERRIDE_VAT))
{
$title = ' title="'.$langs->trans('VATIsNotUsed').'"';
$disabled = true;
@@ -6201,7 +6203,7 @@ class Form
$out .= ajax_combobox($htmlname);
}
- $out .= 'trans("Filters");
$ret .= '';
//$ret .= '';
- $ret .= '
';
+ $ret .= '
';
+ $texttoshow = '
'.$langs->trans("Search").'
';
+
+ $ret .= '
'.$texttoshow.'
';
$ret .= '
';
+ $ret .= '
';
+ // For compatibility with forms that show themself the search criteria in addition of this component, we output the fields
foreach ($arrayofcriterias as $criterias) {
foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 79c87f1ba92..e084028b430 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -959,7 +959,7 @@ class FormCompany extends Form
$out .= '
'.$langs->trans('Prospect').' ';
}
$out .= '
'.$langs->trans('Supplier').' ';
- $out .= '
'.$langs->trans('Others').' ';
+ $out .= '
'.$langs->trans('Other').' ';
} elseif ($typeinput == 'admin') {
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
$out .= '
'.$langs->trans('ProspectCustomer').' ';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 111605d38b7..e84feb90601 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -125,7 +125,7 @@ class FormFile
$out .= '
';
}
- $out .= '
';
+ $out .= '';
$out .= '';
if (!empty($options)) $out .= ''.$options.' ';
@@ -168,7 +168,7 @@ class FormFile
$out .= '('.$langs->trans("Everybody").') ';
}
- elseif (! empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+ elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
$tmpuser = new User($this->db);
$tmpuser->fetch($obj->fk_user);
$label .= ' ('.$tmpuser->getFullName($langs).') ';
@@ -164,7 +164,7 @@ class FormOther
if ($obj->fk_user == 0) {
$label .= ' ('.$langs->trans("Everybody").') ';
}
- elseif (! empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+ elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
$tmpuser = new User($this->db);
$tmpuser->fetch($obj->fk_user);
$label .= ' ('.$tmpuser->getFullName($langs).') ';
@@ -432,61 +432,61 @@ class FormOther
// Enhance with select2
if ($conf->use_javascript_ajax)
{
- include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
$comboenhancement = ajax_combobox($htmlname);
if ($comboenhancement)
{
- $out.=$comboenhancement;
+ $out .= $comboenhancement;
}
}
// Select each sales and print them in a select input
- $out.='';
- if ($showempty) $out.=' ';
+ $out .= '';
+ if ($showempty) $out .= ' ';
// Get list of users allowed to be viewed
$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
- $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";
+ $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
- if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+ if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
{
- if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
- $sql_usr.= " WHERE u.entity IS NOT NULL"; // Show all users
+ if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+ $sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
} else {
- $sql_usr.= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
- $sql_usr.= " OR u.entity = 0"; // Show always superadmin
+ $sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
+ $sql_usr .= " OR u.entity = 0"; // Show always superadmin
}
}
else
{
- $sql_usr.= " WHERE u.entity IN (".getEntity('user').")";
+ $sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
}
- if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;
- if (! empty($user->socid)) $sql_usr.=" AND u.fk_soc = ".$user->socid;
+ if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
+ if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
// Add existing sales representatives of thirdparty of external user
if (empty($user->rights->user->user->lire) && $user->socid)
{
- $sql_usr.=" UNION ";
- $sql_usr.= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
- $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql_usr .= " UNION ";
+ $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
+ $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+ if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
{
- if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
- $sql_usr.= " WHERE u2.entity IS NOT NULL"; // Show all users
+ if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+ $sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
} else {
- $sql_usr.= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
+ $sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
}
}
else
{
- $sql_usr.= " WHERE u2.entity IN (".getEntity('user').")";
+ $sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
}
- $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
+ $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
}
- $sql_usr.= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
+ $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
//print $sql_usr;exit;
$resql_usr = $this->db->query($sql_usr);
@@ -494,34 +494,34 @@ class FormOther
{
while ($obj_usr = $this->db->fetch_object($resql_usr))
{
- $out.='rowid.'"';
- if ($obj_usr->rowid == $selected) $out.=' selected';
+ if ($obj_usr->rowid == $selected) $out .= ' selected';
- $out.='>';
- $out.=dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
+ $out .= '>';
+ $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
// Complete name with more info
- $moreinfo=0;
- if (! empty($conf->global->MAIN_SHOW_LOGIN))
+ $moreinfo = 0;
+ if (!empty($conf->global->MAIN_SHOW_LOGIN))
{
- $out.=($moreinfo?' - ':' (').$obj_usr->login;
+ $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
$moreinfo++;
}
if ($showstatus >= 0)
{
if ($obj_usr->statut == 1 && $showstatus == 1)
{
- $out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
+ $out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
$moreinfo++;
}
if ($obj_usr->statut == 0)
{
- $out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
+ $out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
$moreinfo++;
}
}
- $out.=($moreinfo?')':'');
- $out.=' ';
+ $out .= ($moreinfo ? ')' : '');
+ $out .= '';
}
$this->db->free($resql_usr);
}
@@ -533,10 +533,10 @@ class FormOther
if ($norepresentative)
{
$langs->load("companies");
- $out.='- '.$langs->trans("NoSalesRepresentativeAffected").' - ';
+ $out .= '- '.$langs->trans("NoSalesRepresentativeAffected").' - ';
}
- $out.=' ';
+ $out .= ' ';
return $out;
}
@@ -1331,11 +1331,129 @@ class FormOther
}
else
{
- $selected=(($useempty && $value != '0' && $value != 'manual')?'':' selected');
+ $selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');
$resultautomanual .= ''.$langs->trans("Automatic").' '."\n";
$resultautomanual .= ''.$langs->trans("Manual").' '."\n";
}
$resultautomanual .= ''."\n";
return $resultautomanual;
}
+
+
+ /**
+ * Return HTML select list to select a group by field
+ *
+ * @param mixed $object Object analyzed
+ * @param array $search_groupby Array of preselected fields
+ * @param array $arrayofgroupby Array of groupby to fill
+ * @return string HTML string component
+ */
+ public function selectGroupByField($object, $search_groupby, &$arrayofgroupby)
+ {
+ global $langs, $extrafields, $form;
+
+ $YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
+ $MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
+ $DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
+ $HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
+ $MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
+ $SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
+
+ foreach ($object->fields as $key => $val) {
+ if (!$val['measure']) {
+ if (in_array($key, array(
+ 'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
+ 'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) continue;
+ if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) continue;
+ if (isset($val['visible']) && !dol_eval($val['visible'], 1)) continue;
+ if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) continue;
+ if (preg_match('/^pass/', $key)) continue;
+ if (in_array($val['type'], array('html', 'text'))) continue;
+ if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+ $arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');
+ $arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');
+ $arrayofgroupby['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');
+ } else {
+ $arrayofgroupby['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);
+ }
+ }
+ }
+ // Add extrafields to Group by
+ if ($object->isextrafieldmanaged) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+ if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
+ if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
+ $arrayofgroupby['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
+ }
+ }
+
+ $arrayofgroupby = dol_sort_array($arrayofgroupby, 'position', 'asc', 0, 0, 1);
+ $arrayofgroupbylabel = array();
+ foreach ($arrayofgroupby as $key => $val) {
+ $arrayofgroupbylabel[$key] = $val['label'];
+ }
+ $result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);
+
+ return $result;
+ }
+
+ /**
+ * Return HTML select list to select a group by field
+ *
+ * @param mixed $object Object analyzed
+ * @param array $search_xaxis Array of preselected fields
+ * @param array $arrayofxaxis Array of groupby to fill
+ * @return string HTML string component
+ */
+ public function selectXAxisField($object, $search_xaxis, &$arrayofxaxis)
+ {
+ global $langs, $extrafields, $form;
+
+ $YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
+ $MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
+ $DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
+ $HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
+ $MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
+ $SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
+
+
+ foreach ($object->fields as $key => $val) {
+ if (!$val['measure']) {
+ if (in_array($key, array(
+ 'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
+ 'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) continue;
+ if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) continue;
+ if (isset($val['visible']) && !dol_eval($val['visible'], 1)) continue;
+ if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) continue;
+ if (preg_match('/^pass/', $key)) continue;
+ if (in_array($val['type'], array('html', 'text'))) continue;
+ if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+ $arrayofxaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');
+ $arrayofxaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');
+ $arrayofxaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');
+ } else {
+ $arrayofxaxis['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);
+ }
+ }
+ }
+
+ // Add extrafields to X-Axis
+ if ($object->isextrafieldmanaged) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+ if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
+ if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
+ $arrayofxaxis['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
+ }
+ }
+
+ $arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 0, 0, 1);
+
+ $arrayofxaxislabel = array();
+ foreach ($arrayofxaxis as $key => $val) {
+ $arrayofxaxislabel[$key] = $val['label'];
+ }
+ $result = $form->selectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);
+
+ return $result;
+ }
}
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index c4f10c69469..26de63f10cc 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -30,8 +30,8 @@
abstract class Stats
{
protected $db;
- protected $lastfetchdate=array(); // Dates of cache file read by methods
- public $cachefilesuffix=''; // Suffix to add to name of cache file (to avoid file name conflicts)
+ protected $lastfetchdate = array(); // Dates of cache file read by methods
+ public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
/**
* Return nb of elements by month for several years
@@ -46,33 +46,33 @@ abstract class Stats
*/
public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
{
- global $conf,$user,$langs;
+ global $conf, $user, $langs;
if ($startyear > $endyear) return -1;
- $datay=array();
+ $datay = array();
// Search into cache
- if (! empty($cachedelay))
+ if (!empty($cachedelay))
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
}
- $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
- $newmask='0644';
+ $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+ $newmask = '0644';
$nowgmt = dol_now();
- $foundintocache=0;
+ $foundintocache = 0;
if ($cachedelay > 0)
{
- $filedate=dol_filemtime($newpathofdestfile);
+ $filedate = dol_filemtime($newpathofdestfile);
if ($filedate >= ($nowgmt - $cachedelay))
{
- $foundintocache=1;
+ $foundintocache = 1;
- $this->lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+ $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
}
else
{
@@ -87,7 +87,7 @@ abstract class Stats
}
else
{
- $year=$startyear;
+ $year = $startyear;
$sm = $startmonth - 1;
if ($sm != 0) $year = $year - 1;
while ($year <= $endyear)
@@ -98,13 +98,13 @@ abstract class Stats
$data = array();
- for ($i = 0 ; $i < 12 ; $i++)
+ for ($i = 0; $i < 12; $i++)
{
- $data[$i][]=$datay[$endyear][($i+$sm)%12][0];
- $year=$startyear;
- while($year <= $endyear)
+ $data[$i][] = $datay[$endyear][($i + $sm) % 12][0];
+ $year = $startyear;
+ while ($year <= $endyear)
{
- $data[$i][]=$datay[$year - (1 - ((int) ($i+$sm)/12)) + ($sm == 0 ? 1 : 0)][($i+$sm)%12][1];
+ $data[$i][] = $datay[$year - (1 - ((int) ($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1];
$year++;
}
}
@@ -114,14 +114,14 @@ abstract class Stats
if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
{
dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
- if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+ if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
$fp = fopen($newpathofdestfile, 'w');
fwrite($fp, json_encode($data));
fclose($fp);
- if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+ if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
@chmod($newpathofdestfile, octdec($newmask));
- $this->lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+ $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
}
// return array(array('Month',val1,val2,val3),...)
@@ -143,33 +143,33 @@ abstract class Stats
*/
public function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
{
- global $conf,$user,$langs;
+ global $conf, $user, $langs;
if ($startyear > $endyear) return -1;
- $datay=array();
+ $datay = array();
// Search into cache
- if (! empty($cachedelay))
+ if (!empty($cachedelay))
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
}
- $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
- $newmask='0644';
+ $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+ $newmask = '0644';
$nowgmt = dol_now();
- $foundintocache=0;
+ $foundintocache = 0;
if ($cachedelay > 0)
{
- $filedate=dol_filemtime($newpathofdestfile);
+ $filedate = dol_filemtime($newpathofdestfile);
if ($filedate >= ($nowgmt - $cachedelay))
{
- $foundintocache=1;
+ $foundintocache = 1;
- $this->lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+ $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
}
else
{
@@ -185,10 +185,10 @@ abstract class Stats
}
else
{
- $year=$startyear;
+ $year = $startyear;
$sm = $startmonth - 1;
if ($sm != 0) $year = $year - 1;
- while($year <= $endyear)
+ while ($year <= $endyear)
{
$datay[$year] = $this->getAmountByMonth($year, $format);
$year++;
@@ -196,13 +196,13 @@ abstract class Stats
$data = array();
// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
- for ($i = 0 ; $i < 12 ; $i++)
+ for ($i = 0; $i < 12; $i++)
{
- $data[$i][]=$datay[$endyear][($i+$sm)%12][0]; // set label
- $year=$startyear;
- while($year <= $endyear)
+ $data[$i][] = $datay[$endyear][($i + $sm) % 12]['label']; // set label
+ $year = $startyear;
+ while ($year <= $endyear)
{
- $data[$i][]=$datay[$year - (1 - ((int) ($i+$sm)/12)) + ($sm == 0 ? 1 : 0)][($i+$sm)%12][1]; // set yval for x=i
+ $data[$i][] = $datay[$year - (1 - ((int) ($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1]; // set yval for x=i
$year++;
}
}
@@ -212,17 +212,17 @@ abstract class Stats
if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
{
dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
- if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+ if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
$fp = fopen($newpathofdestfile, 'w');
if ($fp)
{
fwrite($fp, json_encode($data));
fclose($fp);
- if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+ if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
@chmod($newpathofdestfile, octdec($newmask));
}
else dol_syslog("Failed to write cache file", LOG_ERR);
- $this->lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+ $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
}
return $data;
@@ -239,10 +239,10 @@ abstract class Stats
{
if ($startyear > $endyear) return -1;
- $datay=array();
+ $datay = array();
- $year=$startyear;
- while($year <= $endyear)
+ $year = $startyear;
+ while ($year <= $endyear)
{
$datay[$year] = $this->getAverageByMonth($year);
$year++;
@@ -250,13 +250,13 @@ abstract class Stats
$data = array();
- for ($i = 0 ; $i < 12 ; $i++)
+ for ($i = 0; $i < 12; $i++)
{
- $data[$i][]=$datay[$endyear][$i][0];
- $year=$startyear;
- while($year <= $endyear)
+ $data[$i][] = $datay[$endyear][$i][0];
+ $year = $startyear;
+ while ($year <= $endyear)
{
- $data[$i][]=$datay[$year][$i][1];
+ $data[$i][] = $datay[$year][$i][1];
$year++;
}
}
@@ -269,35 +269,36 @@ abstract class Stats
*
* @param int $year Year
* @param int $cachedelay Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
+ * @param int $limit Limit
* @return array Array of values
*/
- public function getAllByProductEntry($year, $cachedelay = 0)
+ public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)
{
- global $conf,$user,$langs;
+ global $conf, $user, $langs;
- $datay=array();
+ $data = array();
// Search into cache
- if (! empty($cachedelay))
+ if (!empty($cachedelay))
{
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
}
- $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
- $newmask='0644';
+ $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+ $newmask = '0644';
$nowgmt = dol_now();
- $foundintocache=0;
+ $foundintocache = 0;
if ($cachedelay > 0)
{
- $filedate=dol_filemtime($newpathofdestfile);
+ $filedate = dol_filemtime($newpathofdestfile);
if ($filedate >= ($nowgmt - $cachedelay))
{
- $foundintocache=1;
+ $foundintocache = 1;
- $this->lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+ $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
}
else
{
@@ -313,7 +314,7 @@ abstract class Stats
}
else
{
- $data=$this->getAllByProduct($year);
+ $data = $this->getAllByProduct($year, $limit);
// $data[$i][]=$datay[$year][$i][1]; // set yval for x=i
}
@@ -321,16 +322,16 @@ abstract class Stats
if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
{
dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
- if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+ if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
$fp = fopen($newpathofdestfile, 'w');
if ($fp)
{
fwrite($fp, json_encode($data));
fclose($fp);
- if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+ if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
@chmod($newpathofdestfile, octdec($newmask));
}
- $this->lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+ $this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
}
return $data;
@@ -353,7 +354,7 @@ abstract class Stats
$result = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -385,7 +386,7 @@ abstract class Stats
$result = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -395,16 +396,16 @@ abstract class Stats
$row = $this->db->fetch_object($resql);
$result[$i]['year'] = $row->year;
$result[$i]['nb'] = $row->nb;
- if($i>0 && $row->nb>0) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+ if ($i > 0 && $row->nb > 0) $result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;
$result[$i]['total'] = $row->total;
- if($i>0 && $row->total>0) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+ if ($i > 0 && $row->total > 0) $result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;
$result[$i]['avg'] = $row->avg;
- if($i>0 && $row->avg>0) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+ if ($i > 0 && $row->avg > 0) $result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;
// For some $sql only
if (isset($row->weighted))
{
$result[$i]['weighted'] = $row->weighted;
- if($i>0 && $row->weighted>0) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+ if ($i > 0 && $row->weighted > 0) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
}
$i++;
}
@@ -431,11 +432,11 @@ abstract class Stats
// phpcs:enable
global $langs;
- $result=array();
- $res=array();
+ $result = array();
+ $res = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -454,22 +455,22 @@ abstract class Stats
dol_print_error($this->db);
}
- for ($i = 1 ; $i < 13 ; $i++)
+ for ($i = 1; $i < 13; $i++)
{
- $res[$i] = (isset($result[$i])?$result[$i]:0);
+ $res[$i] = (isset($result[$i]) ? $result[$i] : 0);
}
$data = array();
- for ($i = 1 ; $i < 13 ; $i++)
+ for ($i = 1; $i < 13; $i++)
{
- $month='unknown';
- if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
- elseif ($format == 1) $month=$i;
- elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+ $month = 'unknown';
+ if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+ elseif ($format == 1) $month = $i;
+ elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
//$month=dol_substr($month,0,3);
- $data[$i-1] = array($month, $res[$i]);
+ $data[$i - 1] = array($month, $res[$i]);
}
return $data;
@@ -478,7 +479,6 @@ abstract class Stats
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
- * Renvoie le montant totalise par mois pour une annee donnee
* Return the amount per month for a given year
*
* @param int $year Year
@@ -491,12 +491,12 @@ abstract class Stats
// phpcs:enable
global $langs;
- $result=array();
- $res=array();
+ $result = array();
+ $res = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -512,22 +512,22 @@ abstract class Stats
}
else dol_print_error($this->db);
- for ($i = 1 ; $i < 13 ; $i++)
+ for ($i = 1; $i < 13; $i++)
{
- $res[$i] = (int) round((isset($result[$i])?$result[$i]:0));
+ $res[$i] = (int) round((isset($result[$i]) ? $result[$i] : 0));
}
$data = array();
- for ($i = 1 ; $i < 13 ; $i++)
+ for ($i = 1; $i < 13; $i++)
{
- $month='unknown';
- if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
- elseif ($format == 1) $month=$i;
- elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+ $month = 'unknown';
+ if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+ elseif ($format == 1) $month = $i;
+ elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
//$month=dol_substr($month,0,3);
- $data[$i-1] = array($month, $res[$i]);
+ $data[$i - 1] = array($month, $res[$i]);
}
return $data;
@@ -548,11 +548,11 @@ abstract class Stats
// phpcs:enable
global $langs;
- $result=array();
- $res=array();
+ $result = array();
+ $res = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -568,22 +568,22 @@ abstract class Stats
}
else dol_print_error($this->db);
- for ($i = 1 ; $i < 13 ; $i++)
+ for ($i = 1; $i < 13; $i++)
{
- $res[$i] = (isset($result[$i])?$result[$i]:0);
+ $res[$i] = (isset($result[$i]) ? $result[$i] : 0);
}
$data = array();
- for ($i = 1 ; $i < 13 ; $i++)
+ for ($i = 1; $i < 13; $i++)
{
- $month='unknown';
- if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
- elseif ($format == 1) $month=$i;
- elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+ $month = 'unknown';
+ if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+ elseif ($format == 1) $month = $i;
+ elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
//$month=dol_substr($month,0,3);
- $data[$i-1] = array($month, $res[$i]);
+ $data[$i - 1] = array($month, $res[$i]);
}
return $data;
@@ -603,23 +603,22 @@ abstract class Stats
// phpcs:enable
global $langs;
- $result=array();
- $res=array();
+ $result = array();
dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
- $i = 0; $other=0;
+ $i = 0; $other = 0;
while ($i < $num)
{
$row = $this->db->fetch_row($resql);
- if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]); // Ref of product, nb
+ if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb
else $other += $row[1];
$i++;
}
- if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+ if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
$this->db->free($resql);
}
else dol_print_error($this->db);
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 766e063e80c..9a93f886ef4 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -28,10 +28,6 @@
if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
{
require '../main.inc.php';
- require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
- require_once DOL_DOCUMENT_ROOT."/core/lib/company.lib.php";
- require_once DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php";
- require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
// Get parameters
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
@@ -45,7 +41,14 @@ if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
$search_filters = GETPOST('search_filters', 'array');
$search_measures = GETPOST('search_measures', 'array');
- $search_xaxis = GETPOST('search_xaxis', 'array');
+
+ //$search_xaxis = GETPOST('search_xaxis', 'array');
+ if (GETPOST('search_xaxis', 'alpha') && GETPOST('search_xaxis', 'alpha') != '-1') $search_xaxis = array(GETPOST('search_xaxis', 'alpha'));
+ else $search_xaxis = array();
+ //$search_groupby = GETPOST('search_groupby', 'array');
+ if (GETPOST('search_groupby', 'alpha') && GETPOST('search_groupby', 'alpha') != '-1') $search_groupby = array(GETPOST('search_groupby', 'alpha'));
+ else $search_groupby = array();
+
$search_yaxis = GETPOST('search_yaxis', 'array');
$search_graph = GETPOST('search_graph', 'none');
@@ -53,7 +56,7 @@ if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
- $page = GETPOST('page', 'int');
+ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
$offset = $limit * $page;
$pageprev = $page - 1;
@@ -62,8 +65,14 @@ if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
$diroutputmassaction = $conf->user->dir_temp.'/'.$user->id.'/customreport';
}
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/company.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php";
+
// Load traductions files requiredby by page
-$langs->loadLangs(array("companies", "other", "exports"));
+$langs->loadLangs(array("companies", "other", "exports", "sendings"));
$extrafields = new ExtraFields($db);
@@ -76,16 +85,18 @@ $object = null;
$ObjectClassName = '';
// Objects available by default
$arrayoftype = array(
- 'thirdparty' => array('label' => 'ThirdParties', 'ObjectClassName' => 'Societe', 'enabled' => $conf->societe->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"),
- 'contact' => array('label' => 'Contacts', 'ObjectClassName' => 'Contact', 'enabled' => $conf->societe->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"),
- 'contract' => array('label' => 'Contracts', 'ObjectClassName' => 'Contrat', 'enabled' => $conf->contrat->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php", 'langs'=>'contract'),
- 'invoice' => array('label' => 'Invoices', 'ObjectClassName' => 'Facture', 'enabled' => $conf->facture->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"),
- 'invoice_template'=>array('label' => 'PredefinedInvoices', 'ObjectClassName' => 'FactureRec', 'enabled' => $conf->facture->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/compta/class/facturerec.class.php", 'langs'=>'bills'),
+ 'thirdparty' => array('label' => 'ThirdParties', 'ObjectClassName' => 'Societe', 'enabled' => $conf->societe->enabled, 'ClassPath' => "/societe/class/societe.class.php"),
+ 'contact' => array('label' => 'Contacts', 'ObjectClassName' => 'Contact', 'enabled' => $conf->societe->enabled, 'ClassPath' => "/contact/class/contact.class.php"),
+ 'proposal' => array('label' => 'Proposals', 'ObjectClassName' => 'Propal', 'enabled' => $conf->propal->enabled, 'ClassPath' => "/comm/propal/class/propal.class.php"),
+ 'order' => array('label' => 'Orders', 'ObjectClassName' => 'Commande', 'enabled' => $conf->commande->enabled, 'ClassPath' => "/commande/class/commande.class.php"),
+ 'invoice' => array('label' => 'Invoices', 'ObjectClassName' => 'Facture', 'enabled' => $conf->facture->enabled, 'ClassPath' => "/compta/facture/class/facture.class.php"),
+ 'invoice_template'=>array('label' => 'PredefinedInvoices', 'ObjectClassName' => 'FactureRec', 'enabled' => $conf->facture->enabled, 'ClassPath' => "/compta/class/facturerec.class.php", 'langs'=>'bills'),
+ 'contract' => array('label' => 'Contracts', 'ObjectClassName' => 'Contrat', 'enabled' => $conf->contrat->enabled, 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contract'),
'bom' => array('label' => 'BOM', 'ObjectClassName' => 'Bom', 'enabled' => $conf->bom->enabled),
- 'mo' => array('label' => 'MO', 'ObjectClassName' => 'Mo', 'enabled' => $conf->mrp->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/mrp/class/mo.class.php"),
+ 'mo' => array('label' => 'MO', 'ObjectClassName' => 'Mo', 'enabled' => $conf->mrp->enabled, 'ClassPath' => "/mrp/class/mo.class.php"),
'ticket' => array('label' => 'Ticket', 'ObjectClassName' => 'Ticket', 'enabled' => $conf->ticket->enabled),
- 'member' => array('label' => 'Adherent', 'ObjectClassName' => 'Adherent', 'enabled' => $conf->adherent->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php", 'langs'=>'members'),
- 'cotisation' => array('label' => 'Subscriptions', 'ObjectClassName' => 'Subscription', 'enabled' => $conf->adherent->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/adherents/class/subscription.class.php", 'langs'=>'members'),
+ 'member' => array('label' => 'Adherent', 'ObjectClassName' => 'Adherent', 'enabled' => $conf->adherent->enabled, 'ClassPath' => "/adherents/class/adherent.class.php", 'langs'=>'members'),
+ 'cotisation' => array('label' => 'Subscriptions', 'ObjectClassName' => 'Subscription', 'enabled' => $conf->adherent->enabled, 'ClassPath' => "/adherents/class/subscription.class.php", 'langs'=>'members'),
);
// Complete $arrayoftype by external modules
@@ -107,17 +118,14 @@ elseif (is_array($hookmanager->resArray)) {
$arrayoftype[$key] = $val;
}
}
- if (!empty($hookmanager->resArray['modenotusedforlist'])) { // Show objecttype selection even if objecttype is set
- $modenotusedforlist = $hookmanager->resArray['modenotusedforlist'];
- }
}
if ($objecttype) {
try {
- if ($arrayoftype[$objecttype]['ClassPath']) {
- include_once $arrayoftype[$objecttype]['ClassPath'];
+ if (!empty($arrayoftype[$objecttype]['ClassPath'])) {
+ dol_include_once($arrayoftype[$objecttype]['ClassPath']);
} else {
- include_once DOL_DOCUMENT_ROOT."/".$objecttype."/class/".$objecttype.".class.php";
+ dol_include_once("/".$objecttype."/class/".$objecttype.".class.php");
}
$ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
$object = new $ObjectClassName($db);
@@ -134,6 +142,7 @@ if ($user->socid > 0) // Protection if external user
//$socid = $user->socid;
accessforbidden();
}
+
$result = restrictedArea($user, $object->element, 0, '');
// Fetch optionals attributes and labels
@@ -144,6 +153,23 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
$search_component_params = array('');
+$MAXUNIQUEVALFORGROUP = 20;
+$MAXMEASURESINBARGRAPH = 20;
+
+$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
+$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
+$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
+$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
+$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
+$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
+
+$arrayofmesures = array('t.count'=>'Count');
+$arrayofxaxis = array();
+$arrayofgroupby = array();
+$arrayofyaxis = array();
+$arrayofvaluesforgroupby = array();
+
+
/*
* Actions
@@ -158,6 +184,7 @@ $search_component_params = array('');
*/
$form = new Form($db);
+$formother = new FormOther($db);
if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE')) {
llxHeader('', $langs->transnoentitiesnoconv('CustomReports'), '');
@@ -173,14 +200,91 @@ if ($action == 'viewgraph') {
setEventMessages($langs->trans("OnlyOneFieldForXAxisIsPossible"), null, 'warnings');
$search_xaxis = array(0 => $search_xaxis[0]);
}
+ if (count($search_groupby) >= 2) {
+ setEventMessages($langs->trans("ErrorOnlyOneFieldForGroupByIsPossible"), null, 'warnings');
+ $search_groupby = array(0 => $search_groupby[0]);
+ }
if (!count($search_xaxis)) {
setEventMessages($langs->trans("AtLeastOneXAxisIsRequired"), null, 'warnings');
- } elseif ($mode == 'graph' && $search_graph == 'bars' && count($search_measures) > 3) {
- setEventMessages($langs->trans("GraphInBarsAreLimitedTo3Measures"), null, 'warnings');
+ } elseif ($mode == 'graph' && $search_graph == 'bars' && count($search_measures) > $MAXMEASURESINBARGRAPH) {
+ $langs->load("errors");
+ setEventMessages($langs->trans("GraphInBarsAreLimitedToNMeasures", $MAXMEASURESINBARGRAPH), null, 'warnings');
$search_graph = 'lines';
}
}
+// Get all possible values of fields when a 'group by' is set, and save this into $arrayofvaluesforgroupby
+if (is_array($search_groupby) && count($search_groupby)) {
+ foreach ($search_groupby as $gkey => $gval) {
+ $gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
+
+ if (preg_match('/\-year$/', $search_groupby[$gkey])) {
+ $tmpval = preg_replace('/\-year$/', '', $search_groupby[$gkey]);
+ $fieldtocount .= 'DATE_FORMAT('.$tmpval.", '%Y')";
+ } elseif (preg_match('/\-month$/', $search_groupby[$gkey])) {
+ $tmpval = preg_replace('/\-month$/', '', $search_groupby[$gkey]);
+ $fieldtocount .= 'DATE_FORMAT('.$tmpval.", '%Y-%m')";
+ } elseif (preg_match('/\-day$/', $search_groupby[$gkey])) {
+ $tmpval = preg_replace('/\-day$/', '', $search_groupby[$gkey]);
+ $fieldtocount .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d')";
+ } else {
+ $fieldtocount = $search_groupby[$gkey];
+ }
+
+ $sql = 'SELECT DISTINCT '.$fieldtocount.' as val';
+ if (strpos($fieldtocount, 'te.') === 0) {
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te';
+ } else {
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
+ }
+ // TODO Add the where here
+
+ $sql .= ' LIMIT '.($MAXUNIQUEVALFORGROUP + 1);
+
+ //print $sql;
+ $resql = $db->query($sql);
+ if (!$resql) {
+ dol_print_error($db);
+ }
+
+ while ($obj = $db->fetch_object($resql)) {
+ if (is_null($obj->val)) {
+ $keytouse = '__NULL__';
+ $valuetranslated = $langs->transnoentitiesnoconv("NotDefined");
+ }
+ elseif ($obj->val === '') {
+ $keytouse = '';
+ $valuetranslated = $langs->transnoentitiesnoconv("Empty");
+ }
+ else {
+ $keytouse = (string) $obj->val;
+ $valuetranslated = $obj->val;
+ }
+ if (!empty($object->fields[$gvalwithoutprefix]['arrayofkeyval'])) {
+ $valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val];
+ if (is_null($valuetranslated)) $valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
+ $valuetranslated = $langs->trans($valuetranslated);
+ }
+
+ $arrayofvaluesforgroupby['g_'.$gkey][$keytouse] = $valuetranslated;
+ }
+ asort($arrayofvaluesforgroupby['g_'.$gkey]);
+
+ if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
+ $langs->load("errors");
+ //var_dump($gkey.' '.$gval.' '.$gvalwithoutprefix);
+ $gvalwithoutprefix = preg_replace('/\-(year|month|day)/', '', $gvalwithoutprefix);
+ $labeloffield = $langs->transnoentitiesnoconv($object->fields[$gvalwithoutprefix]['label']);
+ setEventMessages($langs->trans("ErrorTooManyDifferentValueForSelectedGroupBy", $MAXUNIQUEVALFORGROUP, $labeloffield), null, 'warnings');
+ $search_groupby = array();
+ }
+
+ $db->free($resql);
+ }
+}
+//var_dump($arrayofvaluesforgroupby);exit;
+
+
$tmparray = dol_getdate(dol_now());
$endyear = $tmparray['year'];
$endmonth = $tmparray['mon'];
@@ -189,10 +293,6 @@ $startyear = $endyear - 2;
$param = '';
-$arrayofmesures = array('t.count'=>'Count');
-$arrayofxaxis = array();
-$arrayofyaxis = array();
-
print '
-
+
@@ -176,36 +176,36 @@ $langs->load("modulebuilder");
-trans("Position"); ?> trans("Position"); ?> trans("LanguageFile"); ?> textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?> trans("AllEntities"); ?> trans("AllEntities"); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index f2d3e4e7bb5..d0eaaec25f2 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -27,7 +27,7 @@
*/
// Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
@@ -54,7 +54,7 @@ $langs->load("modulebuilder");
var list = jQuery("#list");
var totalizable = jQuery("#totalizable");
load("modulebuilder");
attributes[$elementtype]['label'][$attrname];
-$type=$extrafields->attributes[$elementtype]['type'][$attrname];
-$size=$extrafields->attributes[$elementtype]['size'][$attrname];
-$computed=$extrafields->attributes[$elementtype]['computed'][$attrname];
-$default=$extrafields->attributes[$elementtype]['default'][$attrname];
-$unique=$extrafields->attributes[$elementtype]['unique'][$attrname];
-$required=$extrafields->attributes[$elementtype]['required'][$attrname];
-$pos=$extrafields->attributes[$elementtype]['pos'][$attrname];
-$alwayseditable=$extrafields->attributes[$elementtype]['alwayseditable'][$attrname];
-$param=$extrafields->attributes[$elementtype]['param'][$attrname];
-$perms=$extrafields->attributes[$elementtype]['perms'][$attrname];
-$langfile=$extrafields->attributes[$elementtype]['langfile'][$attrname];
-$list=$extrafields->attributes[$elementtype]['list'][$attrname];
+$label = $extrafields->attributes[$elementtype]['label'][$attrname];
+$type = $extrafields->attributes[$elementtype]['type'][$attrname];
+$size = $extrafields->attributes[$elementtype]['size'][$attrname];
+$computed = $extrafields->attributes[$elementtype]['computed'][$attrname];
+$default = $extrafields->attributes[$elementtype]['default'][$attrname];
+$unique = $extrafields->attributes[$elementtype]['unique'][$attrname];
+$required = $extrafields->attributes[$elementtype]['required'][$attrname];
+$pos = $extrafields->attributes[$elementtype]['pos'][$attrname];
+$alwayseditable = $extrafields->attributes[$elementtype]['alwayseditable'][$attrname];
+$param = $extrafields->attributes[$elementtype]['param'][$attrname];
+$perms = $extrafields->attributes[$elementtype]['perms'][$attrname];
+$langfile = $extrafields->attributes[$elementtype]['langfile'][$attrname];
+$list = $extrafields->attributes[$elementtype]['list'][$attrname];
$totalizable = $extrafields->attributes[$elementtype]['totalizable'][$attrname];
-$help=$extrafields->attributes[$elementtype]['help'][$attrname];
-$entitycurrentorall=$extrafields->attributes[$elementtype]['entityid'][$attrname];
-$printable=$extrafields->attributes[$elementtype]['printable'][$attrname];
+$help = $extrafields->attributes[$elementtype]['help'][$attrname];
+$entitycurrentorall = $extrafields->attributes[$elementtype]['entityid'][$attrname];
+$printable = $extrafields->attributes[$elementtype]['printable'][$attrname];
-if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))
+if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))
{
$param_chain = '';
foreach ($param['options'] as $key => $value)
{
- if(strlen($key))
+ if (strlen($key))
{
$param_chain .= $key.','.$value."\n";
}
}
}
-elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
+elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
{
- $paramlist=array_keys($param['options']);
+ $paramlist = array_keys($param['options']);
$param_chain = $paramlist[0];
}
?>
@@ -192,10 +192,10 @@ elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($t
trans("Type"); ?>
array('varchar', 'phone', 'mail', 'url', 'select', 'password', 'text', 'html'),
- 'text'=>array('text','html'),
- 'html'=>array('text','html'),
+ 'text'=>array('text', 'html'),
+ 'html'=>array('text', 'html'),
'password'=>array('password', 'varchar'),
'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
@@ -204,12 +204,12 @@ $typewecanchangeinto=array(
);
if (in_array($type, array_keys($typewecanchangeinto)))
{
- $newarray=array();
+ $newarray = array();
print '';
- foreach($type2label as $key => $val)
+ foreach ($type2label as $key => $val)
{
- $selected='';
- if ($key == (GETPOST('type', 'alpha')?GETPOST('type', 'alpha'):$type)) $selected=' selected="selected"';
+ $selected = '';
+ if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';
if (in_array($key, $typewecanchangeinto[$type])) print ''.$val.' ';
else print ''.$val.' ';
}
@@ -245,9 +245,9 @@ else
trans("Position"); ?> trans("Position"); ?> trans("LanguageFile"); ?> trans("LanguageFile"); ?> textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?> trans("AllEntities"); ?> trans("AllEntities"); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 769c12ceaa5..b2bb69aa0bf 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -25,7 +25,7 @@
*/
// Protection to avoid direct call of template
-if (empty($langs) || ! is_object($langs))
+if (empty($langs) || !is_object($langs))
{
print "Error, template page can't be called as URL";
exit;
@@ -66,7 +66,7 @@ print ''.$langs->trans("AlwaysEditable").' ';
print ''.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).' ';
print ''.$form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")).' ';
print ''.$form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")).' ';
-if ($conf->multicompany->enabled){
+if ($conf->multicompany->enabled) {
print ''.$langs->trans("Entities").' ';
}
print ' ';
@@ -74,16 +74,16 @@ print "\n";
if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafields->attributes[$elementtype]['type']))
{
- foreach($extrafields->attributes[$elementtype]['type'] as $key => $value)
+ foreach ($extrafields->attributes[$elementtype]['type'] as $key => $value)
{
// Load language if required
- if (! empty($extrafields->attributes[$elementtype]['langfile'][$key])) {
+ if (!empty($extrafields->attributes[$elementtype]['langfile'][$key])) {
$langs->load($extrafields->attributes[$elementtype]['langfile'][$key]);
}
print '';
print "".$extrafields->attributes[$elementtype]['pos'][$key]." \n";
- print "".$extrafields->attributes[$elementtype]['label'][$key]." \n"; // We don't translate here, we want admin to know what is the key not translated value
+ print "".$extrafields->attributes[$elementtype]['label'][$key]." \n"; // We don't translate here, we want admin to know what is the key not translated value
print "".$langs->trans($extrafields->attributes[$elementtype]['label'][$key])." \n";
print "".$key." \n";
print "".$type2label[$extrafields->attributes[$elementtype]['type'][$key]]." \n";
@@ -93,9 +93,9 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
print ''.yn($extrafields->attributes[$elementtype]['required'][$key])." \n";
print ''.yn($extrafields->attributes[$elementtype]['alwayseditable'][$key])." \n";
print ''.$extrafields->attributes[$elementtype]['list'][$key]." \n";
- print ''.yn($extrafields->attributes[$elementtype]['printable'][$key])." \n";
+ print ''.$extrafields->attributes[$elementtype]['printable'][$key]." \n";
print ''.yn($extrafields->attributes[$elementtype]['totalizable'][$key])." \n";
- if (! empty($conf->multicompany->enabled)) {
+ if (!empty($conf->multicompany->enabled)) {
print '';
if (empty($extrafields->attributes[$elementtype]['entityid'][$key]))
{
@@ -103,7 +103,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
}
else {
global $multicompanylabel_cache;
- if (! is_array($multicompanylabel_cache)) $multicompanylabel_cache = array();
+ if (!is_array($multicompanylabel_cache)) $multicompanylabel_cache = array();
if (empty($multicompanylabel_cache[$extrafields->attributes[$elementtype]['entityid'][$key]])) {
global $mc;
$mc->getInfo($extrafields->attributes[$elementtype]['entityid'][$key]);
@@ -120,8 +120,8 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
}
else
{
- $colspan=13;
- if (! empty($conf->multicompany->enabled)) $colspan++;
+ $colspan = 13;
+ if (!empty($conf->multicompany->enabled)) $colspan++;
print ' ';
print '';
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index d14503a9039..eca100731ac 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -28,7 +28,6 @@ if (empty($object) || !is_object($object))
exit;
}
-
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -66,8 +65,9 @@ $userstatic = new User($db);
select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');
+ $nbofcontacts = $form->select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');
$newcardbutton = '';
- if (! empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer)
+ if (!empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer)
{
$newcardbutton .= '
';
}
@@ -140,111 +140,182 @@ if ($permission) {
element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+ $tmpobject = $object;
+ if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
$formcompany->selectTypeContact($tmpobject, '', 'type', 'external', 'position', 0, 'minwidth100imp'); ?>
-
-
+print "";
-element == 'shipping'|| $object->element == 'reception') && is_object($objectsrc)) $tmpobject=$objectsrc;
+/**
+* Prepare list
+*/
+
+// TODO: replace this with direct SQL string to use $db->sort($sortfield, $sortorder)
+$list = array();
+foreach (array('internal', 'external') as $source)
+{
+ $tmpobject = $object;
+
+ if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc))
+ {
+ $tmpobject = $objectsrc;
+ }
$tab = $tmpobject->liste_contact(-1, $source);
- $num=count($tab);
+ $num = count($tab);
$i = 0;
- while ($i < $num) {
- ?>
+ while ($i < $num)
+ {
+ $entry = new stdClass();
+
+ $entry->id = $tab[$i]['rowid'];
+ $entry->type = $tab[$i]['libelle'];
+
+ if ($tab[$i]['source'] == 'internal')
+ {
+ $entry->nature = $langs->trans("User");
+ }
+ elseif ($tab[$i]['source'] == 'external')
+ {
+ $entry->nature = $langs->trans("ThirdPartyContact");
+ }
-
- status = $userstatic->LibStatut($tab[$i]['statuscontact'], 3);
+ }
+ elseif ($tab[$i]['source'] == 'external')
+ {
+ $entry->status = $contactstatic->LibStatut($tab[$i]['statuscontact'], 3);
+ }
+
+ $i++;
+ $list[] = $entry;
}
}
-print "\n";
-print "\n";
+
+$sortfield = GETPOST("sortfield", "alpha");
+$sortorder = GETPOST("sortorder", 'alpha');
+
+if (!$sortfield) $sortfield = "nature";
+if (!$sortorder) $sortorder = "asc";
+
+// Re-sort list
+$list = dol_sort_array($list, $sortfield, $sortorder, 1, 0, 1);
+
+$arrayfields = array(
+ 'rowid' => array('label'=>$langs->trans("Id"), 'checked'=>1),
+ 'nature' => array('label'=>$langs->trans("NatureOfContact"), 'checked'=>1),
+ 'thirdparty' => array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+ 'contact' => array('label'=>$langs->trans("Users").'/'.$langs->trans("Contacts"), 'checked'=>1),
+ 'type' => array('label'=>$langs->trans("ContactType"), 'checked'=>1),
+ 'status' => array('label'=>$langs->trans("Status"), 'checked'=>1),
+ 'link' => array('label'=>$langs->trans("Link"), 'checked'=>1),
+);
+
+$param = 'id='.$object->id.'&mainmenu=home';
+
+/**
+ * Show list
+ */
+
+print ' ';
print $form->selectUnits($line->fk_unit, "units");
@@ -636,11 +636,15 @@ if (!empty($usemargins) && $user->rights->margins->creer)
{
console.log("We are in a price per qty context, we do not call ajax/product");
} else {
+ global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { ?>
+ if (isNaN(pbq)) { console.log("We use experimental option PRODUIT_CUSTOMER_PRICES_BY_QTY or PRODUIT_CUSTOMER_PRICES_BY_QTY but we are not yet able to get the id of pbq from product combo list, so load of price may be 0 if product has differet prices"); }
+
// Get the HT price for the product and display it
- console.log("Load price without tax and set it into #price_ht for id="+$(this).val()+" socid=socid; ?>");
+ console.log("Load unit price without tax and set it into #price_ht for product id="+$(this).val()+" socid=socid; ?>");
$.post('/product/ajax/products.php?action=fetch',
{ 'id': $(this).val(), 'socid': socid; ?> },
function(data) {
+ console.log("Load unit price end, we got value "+data.price_ht);
jQuery("#price_ht").val(data.price_ht);
},
'json'
@@ -658,95 +662,96 @@ if (!empty($usemargins) && $user->rights->margins->creer)
$("#fournprice_predef").find("option").remove();
$("#fournprice_predef").hide();
$("#buying_price").val("").show();
+
/* Call post to load content of combo list fournprice_predef */
$.post('/fourn/ajax/getSupplierPrices.php?bestpricefirst=1', { 'idprod': $(this).val() }, function(data) {
- if (data && data.length > 0)
- {
- var options = ''; var defaultkey = ''; var defaultprice = ''; var bestpricefound = 0;
-
- var bestpriceid = 0; var bestpricevalue = 0;
- var pmppriceid = 0; var pmppricevalue = 0;
- var costpriceid = 0; var costpricevalue = 0;
-
- /* setup of margin calculation */
- var defaultbuyprice = 'global->MARGIN_TYPE))
- {
- if ($conf->global->MARGIN_TYPE == '1') print 'bestsupplierprice';
- if ($conf->global->MARGIN_TYPE == 'pmp') print 'pmp';
- if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
- } ?>';
- console.log("we will set the field for margin. defaultbuyprice="+defaultbuyprice);
-
- var i = 0;
- $(data).each(function() {
- /* Warning: Lines must be processed in order: best supplier price, then pmpprice line then costprice */
- if (this.id != 'pmpprice' && this.id != 'costprice')
+ if (data && data.length > 0)
{
- i++;
- this.price = parseFloat(this.price); // to fix when this.price >0
- // If margin is calculated on best supplier price, we set it by defaut (but only if value is not 0)
- //console.log("id="+this.id+"-price="+this.price+"-"+(this.price > 0));
- if (bestpricefound == 0 && this.price > 0) { defaultkey = this.id; defaultprice = this.price; bestpriceid = this.id; bestpricevalue = this.price; bestpricefound=1; } // bestpricefound is used to take the first price > 0
- }
- if (this.id == 'pmpprice')
- {
- // If margin is calculated on PMP, we set it by defaut (but only if value is not 0)
- console.log("id="+this.id+"-price="+this.price);
- if ('pmp' == defaultbuyprice || 'costprice' == defaultbuyprice)
+ var options = ''; var defaultkey = ''; var defaultprice = ''; var bestpricefound = 0;
+
+ var bestpriceid = 0; var bestpricevalue = 0;
+ var pmppriceid = 0; var pmppricevalue = 0;
+ var costpriceid = 0; var costpricevalue = 0;
+
+ /* setup of margin calculation */
+ var defaultbuyprice = 'global->MARGIN_TYPE))
{
- if (this.price > 0) {
- defaultkey = this.id; defaultprice = this.price; pmppriceid = this.id; pmppricevalue = this.price;
- //console.log("pmppricevalue="+pmppricevalue);
+ if ($conf->global->MARGIN_TYPE == '1') print 'bestsupplierprice';
+ if ($conf->global->MARGIN_TYPE == 'pmp') print 'pmp';
+ if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
+ } ?>';
+ console.log("we will set the field for margin. defaultbuyprice="+defaultbuyprice);
+
+ var i = 0;
+ $(data).each(function() {
+ /* Warning: Lines must be processed in order: best supplier price, then pmpprice line then costprice */
+ if (this.id != 'pmpprice' && this.id != 'costprice')
+ {
+ i++;
+ this.price = parseFloat(this.price); // to fix when this.price >0
+ // If margin is calculated on best supplier price, we set it by defaut (but only if value is not 0)
+ //console.log("id="+this.id+"-price="+this.price+"-"+(this.price > 0));
+ if (bestpricefound == 0 && this.price > 0) { defaultkey = this.id; defaultprice = this.price; bestpriceid = this.id; bestpricevalue = this.price; bestpricefound=1; } // bestpricefound is used to take the first price > 0
}
- }
- }
- if (this.id == 'costprice')
- {
- // If margin is calculated on Cost price, we set it by defaut (but only if value is not 0)
- console.log("id="+this.id+"-price="+this.price+"-pmppricevalue="+pmppricevalue);
- if ('costprice' == defaultbuyprice)
+ if (this.id == 'pmpprice')
+ {
+ // If margin is calculated on PMP, we set it by defaut (but only if value is not 0)
+ console.log("id="+this.id+"-price="+this.price);
+ if ('pmp' == defaultbuyprice || 'costprice' == defaultbuyprice)
+ {
+ if (this.price > 0) {
+ defaultkey = this.id; defaultprice = this.price; pmppriceid = this.id; pmppricevalue = this.price;
+ //console.log("pmppricevalue="+pmppricevalue);
+ }
+ }
+ }
+ if (this.id == 'costprice')
+ {
+ // If margin is calculated on Cost price, we set it by defaut (but only if value is not 0)
+ console.log("id="+this.id+"-price="+this.price+"-pmppricevalue="+pmppricevalue);
+ if ('costprice' == defaultbuyprice)
+ {
+ if (this.price > 0) { defaultkey = this.id; defaultprice = this.price; costpriceid = this.id; costpricevalue = this.price; }
+ else if (pmppricevalue > 0) { defaultkey = 'pmpprice'; defaultprice = pmppricevalue; }
+ }
+ }
+ options += ''+this.label+' ';
+ });
+ options += 'trans("InputPrice"); ?> ';
+
+ console.log("finally selected defaultkey="+defaultkey+" defaultprice for buying price="+defaultprice);
+
+ $("#fournprice_predef").html(options).show();
+ if (defaultkey != '')
{
- if (this.price > 0) { defaultkey = this.id; defaultprice = this.price; costpriceid = this.id; costpricevalue = this.price; }
- else if (pmppricevalue > 0) { defaultkey = 'pmpprice'; defaultprice = pmppricevalue; }
+ $("#fournprice_predef").val(defaultkey);
}
+
+ /* At loading, no product are yet selected, so we hide field of buying_price */
+ $("#buying_price").hide();
+
+ /* Define default price at loading */
+ var defaultprice = $("#fournprice_predef").find('option:selected').attr("price");
+ $("#buying_price").val(defaultprice);
+
+ $("#fournprice_predef").change(function() {
+ console.log("change on fournprice_predef");
+ /* Hide field buying_price according to choice into list (if 'inputprice' or not) */
+ var linevalue=$(this).find('option:selected').val();
+ var pricevalue = $(this).find('option:selected').attr("price");
+ if (linevalue != 'inputprice' && linevalue != 'pmpprice') {
+ $("#buying_price").val(pricevalue).hide(); /* We set value then hide field */
+ }
+ if (linevalue == 'inputprice') {
+ $('#buying_price').show();
+ }
+ if (linevalue == 'pmpprice') {
+ $("#buying_price").val(pricevalue);
+ $('#buying_price').hide();
+ }
+ });
}
- options += ''+this.label+' ';
- });
- options += 'trans("InputPrice"); ?> ';
-
- console.log("finally selected defaultkey="+defaultkey+" defaultprice="+defaultprice);
-
- $("#fournprice_predef").html(options).show();
- if (defaultkey != '')
- {
- $("#fournprice_predef").val(defaultkey);
- }
-
- /* At loading, no product are yet selected, so we hide field of buying_price */
- $("#buying_price").hide();
-
- /* Define default price at loading */
- var defaultprice = $("#fournprice_predef").find('option:selected').attr("price");
- $("#buying_price").val(defaultprice);
-
- $("#fournprice_predef").change(function() {
- console.log("change on fournprice_predef");
- /* Hide field buying_price according to choice into list (if 'inputprice' or not) */
- var linevalue=$(this).find('option:selected').val();
- var pricevalue = $(this).find('option:selected').attr("price");
- if (linevalue != 'inputprice' && linevalue != 'pmpprice') {
- $("#buying_price").val(pricevalue).hide(); /* We set value then hide field */
- }
- if (linevalue == 'inputprice') {
- $('#buying_price').show();
- }
- if (linevalue == 'pmpprice') {
- $("#buying_price").val(pricevalue);
- $('#buying_price').hide();
- }
- });
- }
},
'json');
@@ -756,7 +761,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
/* To process customer price per quantity (CUSTOMER_PRICE_PER_QTY works only if combo product is not an ajax after x key pressed) */
var pbq = parseInt($('option:selected', this).attr('data-pbq'));
- var pbqup = parseInt($('option:selected', this).attr('data-pbqup'));
+ var pbqup = parseFloat($('option:selected', this).attr('data-pbqup'));
var pbqbase = $('option:selected', this).attr('data-pbqbase');
var pbqqty = parseFloat($('option:selected', this).attr('data-pbqqty'));
var pbqpercent = parseFloat($('option:selected', this).attr('data-pbqpercent'));
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 93d1b37c690..7acd977e714 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -59,13 +59,13 @@ class InterfaceLogevents extends DolibarrTriggers
*/
public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
{
- if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
+ if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
- $key='MAIN_LOGEVENTS_'.$action;
+ $key = 'MAIN_LOGEVENTS_'.$action;
//dol_syslog("xxxxxxxxxxx".$key);
- if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
+ if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
- if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
+ if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
$date = dol_now();
@@ -76,18 +76,18 @@ class InterfaceLogevents extends DolibarrTriggers
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text="(UserLogged,".$object->login.")";
- $text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
- $desc="(UserLogged,".$object->login.")";
- $desc.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
+ $text = "(UserLogged,".$object->login.")";
+ $text .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
+ $desc = "(UserLogged,".$object->login.")";
+ $desc .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
}
if ($action == 'USER_LOGIN_FAILED')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
// Initialisation donnees (date,duree,texte,desc)
- $text=$object->trigger_mesg; // Message direct
- $desc=$object->trigger_mesg; // Message direct
+ $text = $object->trigger_mesg; // Message direct
+ $desc = $object->trigger_mesg; // Message direct
}
if ($action == 'USER_LOGOUT')
{
@@ -95,8 +95,8 @@ class InterfaceLogevents extends DolibarrTriggers
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text="(UserLogoff,".$object->login.")";
- $desc="(UserLogoff,".$object->login.")";
+ $text = "(UserLogoff,".$object->login.")";
+ $desc = "(UserLogoff,".$object->login.")";
}
if ($action == 'USER_CREATE')
{
@@ -104,8 +104,8 @@ class InterfaceLogevents extends DolibarrTriggers
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("NewUserCreated", $object->login);
- $desc=$langs->transnoentities("NewUserCreated", $object->login);
+ $text = $langs->transnoentities("NewUserCreated", $object->login);
+ $desc = $langs->transnoentities("NewUserCreated", $object->login);
}
elseif ($action == 'USER_MODIFY')
{
@@ -113,8 +113,8 @@ class InterfaceLogevents extends DolibarrTriggers
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("EventUserModified", $object->login);
- $desc=$langs->transnoentities("EventUserModified", $object->login);
+ $text = $langs->transnoentities("EventUserModified", $object->login);
+ $desc = $langs->transnoentities("EventUserModified", $object->login);
}
elseif ($action == 'USER_NEW_PASSWORD')
{
@@ -122,8 +122,8 @@ class InterfaceLogevents extends DolibarrTriggers
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("NewUserPassword", $object->login);
- $desc=$langs->transnoentities("NewUserPassword", $object->login);
+ $text = $langs->transnoentities("NewUserPassword", $object->login);
+ $desc = $langs->transnoentities("NewUserPassword", $object->login);
}
elseif ($action == 'USER_ENABLEDISABLE')
{
@@ -132,13 +132,13 @@ class InterfaceLogevents extends DolibarrTriggers
// Initialisation donnees (date,duree,texte,desc)
if ($object->statut == 0)
{
- $text=$langs->transnoentities("UserEnabled", $object->login);
- $desc=$langs->transnoentities("UserEnabled", $object->login);
+ $text = $langs->transnoentities("UserEnabled", $object->login);
+ $desc = $langs->transnoentities("UserEnabled", $object->login);
}
if ($object->statut == 1)
{
- $text=$langs->transnoentities("UserDisabled", $object->login);
- $desc=$langs->transnoentities("UserDisabled", $object->login);
+ $text = $langs->transnoentities("UserDisabled", $object->login);
+ $desc = $langs->transnoentities("UserDisabled", $object->login);
}
}
elseif ($action == 'USER_DELETE')
@@ -146,8 +146,8 @@ class InterfaceLogevents extends DolibarrTriggers
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("UserDeleted", $object->login);
- $desc=$langs->transnoentities("UserDeleted", $object->login);
+ $text = $langs->transnoentities("UserDeleted", $object->login);
+ $desc = $langs->transnoentities("UserDeleted", $object->login);
}
// Groupes
@@ -156,24 +156,24 @@ class InterfaceLogevents extends DolibarrTriggers
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("NewGroupCreated", $object->name);
- $desc=$langs->transnoentities("NewGroupCreated", $object->name);
+ $text = $langs->transnoentities("NewGroupCreated", $object->name);
+ $desc = $langs->transnoentities("NewGroupCreated", $object->name);
}
elseif ($action == 'GROUP_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("GroupModified", $object->name);
- $desc=$langs->transnoentities("GroupModified", $object->name);
+ $text = $langs->transnoentities("GroupModified", $object->name);
+ $desc = $langs->transnoentities("GroupModified", $object->name);
}
elseif ($action == 'GROUP_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("GroupDeleted", $object->name);
- $desc=$langs->transnoentities("GroupDeleted", $object->name);
+ $text = $langs->transnoentities("GroupDeleted", $object->name);
+ $desc = $langs->transnoentities("GroupDeleted", $object->name);
}
// If not found
@@ -186,29 +186,30 @@ class InterfaceLogevents extends DolibarrTriggers
*/
// Add more information into desc from the context property
- if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
+ if (!empty($desc) && !empty($object->context['audit'])) $desc .= ' - '.$object->context['audit'];
// Add entry in event table
include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
- $event=new Events($this->db);
- $event->type=$action;
- $event->dateevent=$date;
- $event->label=$text;
- $event->description=$desc;
- $event->user_agent=$_SERVER["HTTP_USER_AGENT"];
+ $event = new Events($this->db);
+ $event->type = $action;
+ $event->dateevent = $date;
+ $event->label = $text;
+ $event->description = $desc;
+ $event->user_agent = $_SERVER["HTTP_USER_AGENT"];
- $result=$event->create($user);
+ $result = $event->create($user);
if ($result > 0)
{
return 1;
}
else
{
- $error ="Failed to insert security event: ".$event->error;
- $this->error=$error;
+ $error = "Failed to insert security event: ".$event->error;
+ $this->errors[] = $error;
+ $this->error = $error;
- dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
+ dol_syslog(get_class($this).": ".$error, LOG_ERR);
return -1;
}
}
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 26958aed875..3fe9d63c380 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -71,7 +71,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
*/
public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
{
- if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
+ if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
@@ -82,25 +82,25 @@ class InterfaceActionsAuto extends DolibarrTriggers
$langs->load("agenda");
- if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
+ if (empty($object->actiontypecode)) $object->actiontypecode = 'AC_OTH_AUTO';
// Actions
if ($action == 'COMPANY_CREATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","companies"));
+ $langs->loadLangs(array("agenda", "other", "companies"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr", $object->name);
- $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr", $object->name);
- if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+ $object->actionmsg = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+ if (!empty($object->prefix)) $object->actionmsg .= " (".$object->prefix.")";
- $object->sendtoid=0;
- $object->socid=$object->id;
+ $object->sendtoid = 0;
+ $object->socid = $object->id;
}
elseif ($action == 'COMPANY_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
@@ -110,22 +110,22 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'CONTRACT_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","contracts"));
+ $langs->loadLangs(array("agenda", "other", "contracts"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'CONTRACT_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","contracts"));
+ $langs->loadLangs(array("agenda", "other", "contracts"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("ContractSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ContractSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -134,22 +134,22 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'PROPAL_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'PROPAL_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("ProposalSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -158,82 +158,82 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'PROPAL_CLOSE_SIGNED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'PROPAL_CLASSIFY_BILLED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'PROPAL_CLOSE_REFUSED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","orders"));
+ $langs->loadLangs(array("agenda", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_CLOSE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_CLASSIFY_BILLED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_CANCEL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("OrderSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("OrderSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -242,32 +242,32 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'BILL_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'BILL_UNVALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'BILL_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -276,69 +276,69 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'BILL_PAYED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
// Values for this action can't be defined by caller.
- $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+ $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'BILL_CANCEL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'FICHINTER_CREATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","interventions"));
+ $langs->loadLangs(array("agenda", "other", "interventions"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
- $object->sendtoid=0;
- $object->fk_element=0;
- $object->elementtype='';
+ $object->sendtoid = 0;
+ $object->fk_element = 0;
+ $object->elementtype = '';
}
elseif ($action == 'FICHINTER_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","interventions"));
+ $langs->loadLangs(array("agenda", "other", "interventions"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
- $object->fk_element=0;
- $object->elementtype='';
+ $object->sendtoid = 0;
+ $object->fk_element = 0;
+ $object->elementtype = '';
}
elseif ($action == 'FICHINTER_MODIFY')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","interventions"));
+ $langs->loadLangs(array("agenda", "other", "interventions"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
- $object->sendtoid=0;
- $object->fk_element=0;
- $object->elementtype='';
+ $object->sendtoid = 0;
+ $object->fk_element = 0;
+ $object->elementtype = '';
}
elseif ($action == 'FICHINTER_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","interventions"));
+ $langs->loadLangs(array("agenda", "other", "interventions"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("InterventionSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -347,44 +347,44 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","interventions"));
+ $langs->loadLangs(array("agenda", "other", "interventions"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","interventions"));
+ $langs->loadLangs(array("agenda", "other", "interventions"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'FICHINTER_DELETE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","interventions"));
+ $langs->loadLangs(array("agenda", "other", "interventions"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
- $object->sendtoid=0;
- $object->fk_element=0;
- $object->elementtype='';
+ $object->sendtoid = 0;
+ $object->fk_element = 0;
+ $object->elementtype = '';
}
elseif ($action == 'SHIPPING_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","sendings"));
+ $langs->loadLangs(array("agenda", "other", "sendings"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("ShippingValidated", ($object->newref?$object->newref:$object->ref));
+ $object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
}
// Parameters $object->sendtoid defined by caller
@@ -393,12 +393,12 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'SHIPPING_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","sendings"));
+ $langs->loadLangs(array("agenda", "other", "sendings"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("ShippingSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -409,10 +409,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
$langs->load("other");
$langs->load("receptions");
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionValidated", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("ReceptionValidated", ($object->newref?$object->newref:$object->ref));
+ $object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
}
// Parameters $object->sendtoid defined by caller
@@ -424,10 +424,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
$langs->load("other");
$langs->load("receptions");
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("ReceptionSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -436,22 +436,22 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("ProposalSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -460,92 +460,92 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","propal"));
+ $langs->loadLangs(array("agenda", "other", "propal"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SUPPLIER_CREATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SUPPLIER_APPROVE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SUPPLIER_REFUSE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","orders"));
+ $langs->loadLangs(array("agenda", "other", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills","orders"));
+ $langs->loadLangs(array("agenda", "other", "bills", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -554,45 +554,45 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills","orders"));
+ $langs->loadLangs(array("agenda", "other", "bills", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+ $object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
}
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'BILL_SUPPLIER_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
- $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref?$object->newref:$object->ref));
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+ $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills","orders"));
+ $langs->loadLangs(array("agenda", "other", "bills", "orders"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
if (empty($object->actionmsg))
{
- $object->actionmsg=$langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+ $object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
}
// Parameters $object->sendtoid defined by caller
@@ -601,244 +601,244 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'BILL_SUPPLIER_PAYED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'BILL_SUPPLIER_CANCELED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","bills"));
+ $langs->loadLangs(array("agenda", "other", "bills"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
// Members
elseif ($action == 'MEMBER_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","members"));
+ $langs->loadLangs(array("agenda", "other", "members"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
- $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
- $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
- $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'MEMBER_MODIFY')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","members"));
+ $langs->loadLangs(array("agenda", "other", "members"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
- $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
- $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
- $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","members"));
+ $langs->loadLangs(array("agenda", "other", "members"));
$member = $this->context['member'];
- if (! is_object($member)) // This should not happen
+ if (!is_object($member)) // This should not happen
{
include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
$member = new Adherent($this->db);
$member->fetch($this->fk_adherent);
}
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
- $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
- $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
- $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->fk_type;
- $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->amount;
- $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+ $object->actionmsg = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+ $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
+ $object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->amount;
+ $object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
- $object->sendtoid=0;
- if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+ $object->sendtoid = 0;
+ if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
}
elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","members"));
+ $langs->loadLangs(array("agenda", "other", "members"));
$member = $this->context['member'];
- if (! is_object($member)) // This should not happen
+ if (!is_object($member)) // This should not happen
{
include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
$member = new Adherent($this->db);
$member->fetch($this->fk_adherent);
}
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
- $object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
- $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
- $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->fk_type;
- $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->amount;
- $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+ $object->actionmsg = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+ $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
+ $object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->amount;
+ $object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
- $object->sendtoid=0;
- if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+ $object->sendtoid = 0;
+ if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
}
elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","members"));
+ $langs->loadLangs(array("agenda", "other", "members"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
- $object->actionmsg=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
- $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
- $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
- $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
- $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+ $object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+ $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+ $object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+ $object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
- $object->sendtoid=0;
- if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+ $object->sendtoid = 0;
+ if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
}
elseif ($action == 'MEMBER_RESILIATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","members"));
+ $langs->loadLangs(array("agenda", "other", "members"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
- $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
- $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
- $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
elseif ($action == 'MEMBER_DELETE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","members"));
+ $langs->loadLangs(array("agenda", "other", "members"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
- $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
- $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
- $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+ $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
// Projects
elseif ($action == 'PROJECT_CREATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","projects"));
+ $langs->loadLangs(array("agenda", "other", "projects"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
- $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+ $object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
- elseif($action == 'PROJECT_VALIDATE')
+ elseif ($action == 'PROJECT_VALIDATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","projects"));
+ $langs->loadLangs(array("agenda", "other", "projects"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
- $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+ $object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
- elseif($action == 'PROJECT_MODIFY')
+ elseif ($action == 'PROJECT_MODIFY')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","projects"));
+ $langs->loadLangs(array("agenda", "other", "projects"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
- $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+ $object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
// Project tasks
- elseif($action == 'TASK_CREATE')
+ elseif ($action == 'TASK_CREATE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","projects"));
+ $langs->loadLangs(array("agenda", "other", "projects"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
- $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+ $object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
- elseif($action == 'TASK_MODIFY')
+ elseif ($action == 'TASK_MODIFY')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","projects"));
+ $langs->loadLangs(array("agenda", "other", "projects"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr", $object->ref);
- $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("TaskModifieddInDolibarr", $object->ref);
+ $object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
- elseif($action == 'TASK_DELETE')
+ elseif ($action == 'TASK_DELETE')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","projects"));
+ $langs->loadLangs(array("agenda", "other", "projects"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
- $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+ $object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
- elseif($action == 'TICKET_ASSIGNED')
+ elseif ($action == 'TICKET_ASSIGNED')
{
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other","projects"));
+ $langs->loadLangs(array("agenda", "other", "projects"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
- $object->actionmsg=$langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+ $object->actionmsg = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
if ($object->oldcopy->fk_user_assign > 0)
{
- $tmpuser=new User($this->db);
+ $tmpuser = new User($this->db);
$tmpuser->fetch($object->oldcopy->fk_user_assign);
- $object->actionmsg.="\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
}
else
{
- $object->actionmsg.="\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
+ $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
}
if ($object->fk_user_assign > 0)
{
- $tmpuser=new User($this->db);
+ $tmpuser = new User($this->db);
$tmpuser->fetch($object->fk_user_assign);
- $object->actionmsg.="\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
+ $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
}
else
{
- $object->actionmsg.="\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
+ $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
}
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
// TODO Merge all previous cases into this generic one
- else // $action = TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
+ else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
{
// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function). Key can be set in agenda setup if defined into c_action_trigger
// Load translation files required by the page
- $langs->loadLangs(array("agenda","other"));
+ $langs->loadLangs(array("agenda", "other"));
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr", $object->ref);
- if (empty($object->actionmsg)) $object->actionmsg=$langs->transnoentities($action."InDolibarr", $object->ref);
+ if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities($action."InDolibarr", $object->ref);
+ if (empty($object->actionmsg)) $object->actionmsg = $langs->transnoentities($action."InDolibarr", $object->ref);
- $object->sendtoid=0;
+ $object->sendtoid = 0;
}
$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
@@ -846,21 +846,21 @@ class InterfaceActionsAuto extends DolibarrTriggers
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
// Add entry in event table
- $now=dol_now();
+ $now = dol_now();
if (isset($_SESSION['listofnames-'.$object->trackid]))
{
- $attachs=$_SESSION['listofnames-'.$object->trackid];
+ $attachs = $_SESSION['listofnames-'.$object->trackid];
if ($attachs && strpos($action, 'SENTBYMAIL'))
{
- $object->actionmsg=dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
+ $object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
}
}
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
- $contactforaction=new Contact($this->db);
- $societeforaction=new Societe($this->db);
+ $contactforaction = new Contact($this->db);
+ $societeforaction = new Societe($this->db);
// Set contactforaction if there is only 1 contact.
if (is_array($object->sendtoid))
{
@@ -874,7 +874,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
if ($object->socid > 0) $societeforaction->fetch($object->socid);
elseif ($object->fk_soc > 0) $societeforaction->fetch($object->fk_soc);
- $projectid = isset($object->fk_project)?$object->fk_project:0;
+ $projectid = isset($object->fk_project) ? $object->fk_project : 0;
if ($object->element == 'project') $projectid = $object->id;
$elementid = $object->id;
@@ -889,20 +889,20 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Insertion action
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
$actioncomm = new ActionComm($this->db);
- $actioncomm->type_code = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+ $actioncomm->type_code = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
$actioncomm->code = 'AC_'.$action;
$actioncomm->label = $object->actionmsg2;
- $actioncomm->note_private= $object->actionmsg; // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
+ $actioncomm->note_private = $object->actionmsg; // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
$actioncomm->fk_project = $projectid;
$actioncomm->datep = $now;
$actioncomm->datef = $now;
$actioncomm->durationp = 0;
$actioncomm->punctual = 1;
- $actioncomm->percentage = -1; // Not applicable
+ $actioncomm->percentage = -1; // Not applicable
$actioncomm->socid = $societeforaction->id;
$actioncomm->contactid = $contactforaction->id;
- $actioncomm->authorid = $user->id; // User saving action
- $actioncomm->userownerid = $user->id; // Owner of action
+ $actioncomm->authorid = $user->id; // User saving action
+ $actioncomm->userownerid = $user->id; // Owner of action
// Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
$actioncomm->email_msgid = $object->email_msgid;
$actioncomm->email_from = $object->email_from;
@@ -915,28 +915,28 @@ class InterfaceActionsAuto extends DolibarrTriggers
// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
// for such objects because there is already a dedicated field into table llx_actioncomm.
- if (! in_array($elementtype, array('societe','contact','project')))
+ if (!in_array($elementtype, array('societe', 'contact', 'project')))
{
$actioncomm->fk_element = $elementid;
$actioncomm->elementtype = $elementtype;
}
- if (property_exists($object, 'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles)>0) {
- $actioncomm->attachedfiles=$object->attachedfiles;
+ if (property_exists($object, 'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles) > 0) {
+ $actioncomm->attachedfiles = $object->attachedfiles;
}
- if (property_exists($object, 'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid)>0) {
- $actioncomm->userassigned=$object->sendtouserid;
+ if (property_exists($object, 'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid) > 0) {
+ $actioncomm->userassigned = $object->sendtouserid;
}
- $ret=$actioncomm->create($user); // User creating action
+ $ret = $actioncomm->create($user); // User creating action
if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
{
- if (is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
- foreach($object->attachedfiles['paths'] as $key=>$filespath) {
+ if (is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
+ foreach ($object->attachedfiles['paths'] as $key=>$filespath) {
$srcfile = $filespath;
- $destdir = $conf->agenda->dir_output . '/' . $ret;
- $destfile = $destdir . '/' . $object->attachedfiles['names'][$key];
+ $destdir = $conf->agenda->dir_output.'/'.$ret;
+ $destfile = $destdir.'/'.$object->attachedfiles['names'][$key];
if (dol_mkdir($destdir) >= 0) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
dol_copy($srcfile, $destfile);
@@ -945,7 +945,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
}
- unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode); // When several action are called on same object, we must be sure to not reuse value of first action.
+ unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode); // When several action are called on same object, we must be sure to not reuse value of first action.
if ($ret > 0)
{
@@ -954,8 +954,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
else
{
- $this->error="Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
- $this->errors=$actioncomm->errors;
+ $this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
+ $this->errors = $actioncomm->errors;
dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
return -1;
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index ac9f178b163..0b73d95a140 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -47,7 +47,7 @@ $id = GETPOST('id', 'int');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 9e23fe46452..dba5b4cff7b 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -57,7 +57,7 @@ $result = restrictedArea($user, 'don', $id, '');
// Get parameters
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 6366d0fb6e6..39155dae768 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -137,10 +137,10 @@ if ($conf->use_javascript_ajax)
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$dolgraph = new DolGraph();
$dolgraph->SetData($dataseries);
- $dolgraph->setShowLegend(1);
+ $dolgraph->setShowLegend(2);
$dolgraph->setShowPercent(1);
$dolgraph->SetType(array('pie'));
- $dolgraph->setWidth('100%');
+ $dolgraph->setHeight('200');
$dolgraph->draw('idgraphstatus');
print $dolgraph->show($total ? 0 : 1);
@@ -159,7 +159,7 @@ $totalnb = 0;
foreach ($listofstatus as $status)
{
print ' ';
- print ''.$donstatic->LibStatut($status, 4).' '.$donstatic->LibStatut($status, 4).' '.(!empty($nb[$status]) ? $nb[$status] : ' ').' ';
print ''.(!empty($nb[$status]) ?price($somme[$status], 'MT') : ' ').' ';
print ''.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : ' ').' ';
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 48b5f108b81..a61a97f7c78 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -27,27 +27,27 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("companies","donations"));
+$langs->loadLangs(array("companies", "donations"));
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="d.datedon";
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "d.datedon";
-$search_status=(GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_status", 'intcomma') : "-1";
-$search_all=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$search_ref=GETPOST('search_ref', 'alpha');
-$search_company=GETPOST('search_company', 'alpha');
-$search_name=GETPOST('search_name', 'alpha');
+$search_status = (GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_status", 'intcomma') : "-4";
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_company = GETPOST('search_company', 'alpha');
+$search_name = GETPOST('search_name', 'alpha');
$search_amount = GETPOST('search_amount', 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
@@ -60,6 +60,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_company = "";
$search_name = "";
$search_amount = "";
+ $search_status = '';
}
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -78,26 +79,26 @@ $fieldstosearchall = array(
* View
*/
-$form=new Form($db);
-if (! empty($conf->projet->enabled)) $projectstatic=new Project($db);
+$form = new Form($db);
+if (!empty($conf->projet->enabled)) $projectstatic = new Project($db);
llxHeader('', $langs->trans("Donations"), 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones');
-$donationstatic=new Don($db);
+$donationstatic = new Don($db);
// Genere requete de liste des dons
$sql = "SELECT d.rowid, d.datedon, d.fk_soc as socid, d.firstname, d.lastname, d.societe,";
-$sql.= " d.amount, d.fk_statut as status,";
-$sql.= " p.rowid as pid, p.ref, p.title, p.public";
-$sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
-$sql.= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
-if ($search_status != '' && $search_status != '-1')
+$sql .= " d.amount, d.fk_statut as status,";
+$sql .= " p.rowid as pid, p.ref, p.title, p.public";
+$sql .= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
+$sql .= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
+if ($search_status != '' && $search_status != '-4')
{
$sql .= " AND d.fk_statut IN (".$db->escape($search_status).")";
}
if (trim($search_ref) != '')
{
- $sql.= natural_search('d.ref', $search_ref);
+ $sql .= natural_search('d.ref', $search_ref);
}
if (trim($search_all) != '')
{
@@ -136,17 +137,17 @@ if ($resql)
$i = 0;
$param = '';
- if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+ if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
if ($search_status && $search_status != -1) $param .= '&search_status='.urlencode($search_status);
if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
if ($search_company) $param .= '&search_company='.urlencode($search_company);
if ($search_name) $param .= '&search_name='.urlencode($search_name);
if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
- $newcardbutton='';
+ $newcardbutton = '';
if ($user->rights->don->creer)
{
- $newcardbutton.= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
+ $newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
}
print '