Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
This commit is contained in:
markus
commit
34026d1005
@ -298,7 +298,7 @@ script:
|
|||||||
# Ensure we catch errors
|
# Ensure we catch errors
|
||||||
set -e
|
set -e
|
||||||
#parallel-lint --exclude htdocs/includes --blame .
|
#parallel-lint --exclude htdocs/includes --blame .
|
||||||
parallel-lint --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
|
parallel-lint --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
|
||||||
set +e
|
set +e
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|||||||
@ -28,7 +28,7 @@ php-iban 1.4.7 LGPL-3+ Yes
|
|||||||
PHPoAuthLib 0.8.2 MIT License Yes Library to provide oauth1 and oauth2 to different service
|
PHPoAuthLib 0.8.2 MIT License Yes Library to provide oauth1 and oauth2 to different service
|
||||||
PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
|
PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
|
||||||
Restler 3.0.0RC6 LGPL-3+ Yes Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
|
Restler 3.0.0RC6 LGPL-3+ Yes Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
|
||||||
TCPDF 6.2.12 LGPL-3+ Yes PDF generation
|
TCPDF 6.2.25 LGPL-3+ Yes PDF generation
|
||||||
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
|
TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes FPDI replacement
|
||||||
Swift Mailer 5.4.2-DEV MIT license Yes Comprehensive mailing tools for PHP
|
Swift Mailer 5.4.2-DEV MIT license Yes Comprehensive mailing tools for PHP
|
||||||
Stripe 4.7.0 MIT licence Yes Library for Stripe module
|
Stripe 4.7.0 MIT licence Yes Library for Stripe module
|
||||||
@ -53,9 +53,13 @@ JsTimezoneDetect 1.0.6 MIT License Yes
|
|||||||
SwaggerUI 2.0.24 GPL-2+ Yes JS library to offer the REST API explorer
|
SwaggerUI 2.0.24 GPL-2+ Yes JS library to offer the REST API explorer
|
||||||
Ace 1.2.8 BSD Yes JS library to get code syntaxique coloration in a textarea.
|
Ace 1.2.8 BSD Yes JS library to get code syntaxique coloration in a textarea.
|
||||||
|
|
||||||
Image libraries
|
Image libraries:
|
||||||
Octicons 8.1 MIT Yes
|
Octicons 8.1 MIT Yes
|
||||||
|
|
||||||
|
Font libraries:
|
||||||
|
Fontawesome 4.7 ? Yes
|
||||||
|
Fontawesome 5.0 ? Yes
|
||||||
|
|
||||||
|
|
||||||
For licenses compatibility informations:
|
For licenses compatibility informations:
|
||||||
http://www.gnu.org/licenses/licenses.en.html
|
http://www.gnu.org/licenses/licenses.en.html
|
||||||
|
|||||||
@ -4,6 +4,7 @@ English Dolibarr ChangeLog
|
|||||||
|
|
||||||
***** ChangeLog for 10.0.0 compared to 9.0.0 *****
|
***** ChangeLog for 10.0.0 compared to 9.0.0 *****
|
||||||
For Users:
|
For Users:
|
||||||
|
NEW: Module ticket is available as a stable module
|
||||||
NEW: Experimental module "Vendor receptions"
|
NEW: Experimental module "Vendor receptions"
|
||||||
|
|
||||||
For Developers:
|
For Developers:
|
||||||
@ -12,7 +13,7 @@ For Developers:
|
|||||||
WARNING:
|
WARNING:
|
||||||
|
|
||||||
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
|
||||||
* Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus.
|
* Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus for consistency with naming rules.
|
||||||
* API getListOfCivility has been renamed into getListOfCivilities for consistency with naming rules.
|
* API getListOfCivility has been renamed into getListOfCivilities for consistency with naming rules.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -27,12 +27,14 @@
|
|||||||
"php" : ">=5.3.0",
|
"php" : ">=5.3.0",
|
||||||
"ext-curl" : "*",
|
"ext-curl" : "*",
|
||||||
"ccampbell/chromephp" : "4.1.0",
|
"ccampbell/chromephp" : "4.1.0",
|
||||||
"ckeditor/ckeditor": "4.5.9",
|
"ckeditor/ckeditor" : "4.6.2",
|
||||||
"mike42/escpos-php" : "1.2.1",
|
"mike42/escpos-php" : "1.2.1",
|
||||||
"mobiledetect/mobiledetectlib" : "2.8.17",
|
"mobiledetect/mobiledetectlib" : "2.8.17",
|
||||||
"phpoffice/phpexcel" : "1.8.1",
|
"phpoffice/phpexcel" : "1.8.1",
|
||||||
"restler/framework" : "3.0.0-RC6",
|
"restler/framework" : "3.0.0-RC6",
|
||||||
"tecnickcom/tcpdf": "6.2.12"
|
"tecnickcom/tcpdf" : "^6.2",
|
||||||
|
"atgp/factur-x" : "^1.0",
|
||||||
|
"luracast/restler": "^3.0"
|
||||||
},
|
},
|
||||||
"require-dev" : {
|
"require-dev" : {
|
||||||
"jakub-onderka/php-parallel-lint" : "^0",
|
"jakub-onderka/php-parallel-lint" : "^0",
|
||||||
@ -50,7 +52,7 @@
|
|||||||
"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
|
"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
|
||||||
"ext-imagick" : "Image manipulation (TCPDF)",
|
"ext-imagick" : "Image manipulation (TCPDF)",
|
||||||
"ext-mcrypt" : "(Required but maybe built-in PHP)",
|
"ext-mcrypt" : "(Required but maybe built-in PHP)",
|
||||||
"ext-openssl": "Secure connections (Emails, SOAP…)",
|
"ext-openssl" : "Secure connections (Emails, SOAP\u2026)",
|
||||||
"ext-mbstring" : "Handle non UTF-8 databases",
|
"ext-mbstring" : "Handle non UTF-8 databases",
|
||||||
"ext-soap" : "Native SOAP",
|
"ext-soap" : "Native SOAP",
|
||||||
"ext-zip" : "ODT and Excel support",
|
"ext-zip" : "ODT and Excel support",
|
||||||
|
|||||||
341
composer.lock
generated
341
composer.lock
generated
@ -4,9 +4,59 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "c586663818e933f26657871d86d01dc6",
|
"content-hash": "949d55d933c4e0725a2086a189595483",
|
||||||
"content-hash": "09e891bb978d35a48902a5f57760aee9",
|
|
||||||
"packages": [
|
"packages": [
|
||||||
|
{
|
||||||
|
"name": "atgp/factur-x",
|
||||||
|
"version": "v1.0.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/atgp/factur-x.git",
|
||||||
|
"reference": "22e22c3b5dfbb0f25afbd7c3fe69a0305199414c"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/atgp/factur-x/zipball/22e22c3b5dfbb0f25afbd7c3fe69a0305199414c",
|
||||||
|
"reference": "22e22c3b5dfbb0f25afbd7c3fe69a0305199414c",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-dom": "*",
|
||||||
|
"ext-fileinfo": "*",
|
||||||
|
"ext-libxml": "*",
|
||||||
|
"ext-simplexml": "*",
|
||||||
|
"ext-zlib": "*",
|
||||||
|
"php": ">=5.6",
|
||||||
|
"setasign/fpdi-fpdf": "^2.0",
|
||||||
|
"smalot/pdfparser": "^0.13.2"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Atgp\\FacturX\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Lucas Gouy-Pailler",
|
||||||
|
"email": "lucas.gouypailler@atgp.net"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "PHP library to manage your Factur-X / ZUGFeRD 2.0 PDF invoices files",
|
||||||
|
"keywords": [
|
||||||
|
"ZUGFeRD",
|
||||||
|
"factur-x",
|
||||||
|
"invoice",
|
||||||
|
"pdf",
|
||||||
|
"php",
|
||||||
|
"xml"
|
||||||
|
],
|
||||||
|
"time": "2019-01-16T10:09:35+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "ccampbell/chromephp",
|
"name": "ccampbell/chromephp",
|
||||||
"version": "4.1.0",
|
"version": "4.1.0",
|
||||||
@ -48,20 +98,20 @@
|
|||||||
"log",
|
"log",
|
||||||
"logging"
|
"logging"
|
||||||
],
|
],
|
||||||
"time": "2013-06-26 03:44:33"
|
"time": "2013-06-26T03:44:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ckeditor/ckeditor",
|
"name": "ckeditor/ckeditor",
|
||||||
"version": "4.5.11",
|
"version": "4.6.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/ckeditor/ckeditor-releases.git",
|
"url": "https://github.com/ckeditor/ckeditor-releases.git",
|
||||||
"reference": "48155a1e1c7e84736b5a166ad3f33acea2a51255"
|
"reference": "268078ab43195b6004d64bc8764c41f2f829640e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/48155a1e1c7e84736b5a166ad3f33acea2a51255",
|
"url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/268078ab43195b6004d64bc8764c41f2f829640e",
|
||||||
"reference": "48155a1e1c7e84736b5a166ad3f33acea2a51255",
|
"reference": "268078ab43195b6004d64bc8764c41f2f829640e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
@ -89,7 +139,7 @@
|
|||||||
"text",
|
"text",
|
||||||
"wysiwyg"
|
"wysiwyg"
|
||||||
],
|
],
|
||||||
"time": "2016-09-07 13:32:39"
|
"time": "2017-01-12T17:36:48+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mike42/escpos-php",
|
"name": "mike42/escpos-php",
|
||||||
@ -153,7 +203,7 @@
|
|||||||
"print",
|
"print",
|
||||||
"receipt"
|
"receipt"
|
||||||
],
|
],
|
||||||
"time": "2016-04-25 01:14:07"
|
"time": "2016-04-25T01:14:07+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mobiledetect/mobiledetectlib",
|
"name": "mobiledetect/mobiledetectlib",
|
||||||
@ -207,7 +257,7 @@
|
|||||||
"mobile detector",
|
"mobile detector",
|
||||||
"php mobile detect"
|
"php mobile detect"
|
||||||
],
|
],
|
||||||
"time": "2015-09-17 14:45:21"
|
"time": "2015-09-17T14:45:21+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpoffice/phpexcel",
|
"name": "phpoffice/phpexcel",
|
||||||
@ -264,7 +314,8 @@
|
|||||||
"xls",
|
"xls",
|
||||||
"xlsx"
|
"xlsx"
|
||||||
],
|
],
|
||||||
"time": "2015-05-01 07:00:55"
|
"abandoned": "phpoffice/phpspreadsheet",
|
||||||
|
"time": "2015-05-01T07:00:55+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "restler/framework",
|
"name": "restler/framework",
|
||||||
@ -273,12 +324,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Luracast/Restler-Framework.git",
|
"url": "https://github.com/Luracast/Restler-Framework.git",
|
||||||
"reference": "3388d76e73a81f871ce5baa906271071b12cd17f"
|
"reference": "6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/3388d76e73a81f871ce5baa906271071b12cd17f",
|
"url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09",
|
||||||
"reference": "3388d76e73a81f871ce5baa906271071b12cd17f",
|
"reference": "6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -325,20 +376,209 @@
|
|||||||
"rest",
|
"rest",
|
||||||
"server"
|
"server"
|
||||||
],
|
],
|
||||||
"time": "2016-06-21 12:42:18"
|
"time": "2018-01-06T01:39:27+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "tecnickcom/tcpdf",
|
"name": "setasign/fpdf",
|
||||||
"version": "6.2.12",
|
"version": "1.8.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/tecnickcom/TCPDF.git",
|
"url": "https://github.com/Setasign/FPDF.git",
|
||||||
"reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f"
|
"reference": "2c68c9e6c034ac3187d25968790139a73184cdb1"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f",
|
"url": "https://api.github.com/repos/Setasign/FPDF/zipball/2c68c9e6c034ac3187d25968790139a73184cdb1",
|
||||||
"reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f",
|
"reference": "2c68c9e6c034ac3187d25968790139a73184cdb1",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"fpdf.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"no usage restriction"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Olivier Plathey",
|
||||||
|
"email": "oliver@fpdf.org",
|
||||||
|
"homepage": "http://fpdf.org/"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "FPDF is a PHP class which allows to generate PDF files with pure PHP. F from FPDF stands for Free: you may use it for any kind of usage and modify it to suit your needs.",
|
||||||
|
"homepage": "http://www.fpdf.org",
|
||||||
|
"keywords": [
|
||||||
|
"fpdf",
|
||||||
|
"pdf"
|
||||||
|
],
|
||||||
|
"time": "2016-01-01T17:47:15+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "setasign/fpdi",
|
||||||
|
"version": "v2.2.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/Setasign/FPDI.git",
|
||||||
|
"reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/Setasign/FPDI/zipball/3c266002f8044f61b17329f7cd702d44d73f0f7f",
|
||||||
|
"reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-zlib": "*",
|
||||||
|
"php": "^5.6 || ^7.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~5.7",
|
||||||
|
"setasign/fpdf": "~1.8",
|
||||||
|
"setasign/tfpdf": "1.25",
|
||||||
|
"tecnickcom/tcpdf": "~6.2"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured.",
|
||||||
|
"setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.",
|
||||||
|
"setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF.",
|
||||||
|
"setasign/fpdi-tfpdf": "Use this package to automatically evaluate dependencies to tFPDF."
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"setasign\\Fpdi\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Jan Slabon",
|
||||||
|
"email": "jan.slabon@setasign.com",
|
||||||
|
"homepage": "https://www.setasign.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Maximilian Kresse",
|
||||||
|
"email": "maximilian.kresse@setasign.com",
|
||||||
|
"homepage": "https://www.setasign.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
|
||||||
|
"homepage": "https://www.setasign.com/fpdi",
|
||||||
|
"keywords": [
|
||||||
|
"fpdf",
|
||||||
|
"fpdi",
|
||||||
|
"pdf"
|
||||||
|
],
|
||||||
|
"time": "2019-01-30T14:11:19+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "setasign/fpdi-fpdf",
|
||||||
|
"version": "v2.2.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/Setasign/FPDI-FPDF.git",
|
||||||
|
"reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/Setasign/FPDI-FPDF/zipball/e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
|
||||||
|
"reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"setasign/fpdf": "^1.8",
|
||||||
|
"setasign/fpdi": "^2.2"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Jan Slabon",
|
||||||
|
"email": "jan.slabon@setasign.com",
|
||||||
|
"homepage": "https://www.setasign.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Kind of metadata package for dependencies of the latest versions of FPDI and FPDF.",
|
||||||
|
"homepage": "https://www.setasign.com/fpdi",
|
||||||
|
"keywords": [
|
||||||
|
"fpdf",
|
||||||
|
"fpdi",
|
||||||
|
"pdf"
|
||||||
|
],
|
||||||
|
"time": "2019-01-30T14:38:19+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "smalot/pdfparser",
|
||||||
|
"version": "v0.13.3",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/smalot/pdfparser.git",
|
||||||
|
"reference": "c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/smalot/pdfparser/zipball/c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6",
|
||||||
|
"reference": "c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-mbstring": "*",
|
||||||
|
"ext-zlib": "*",
|
||||||
|
"php": ">=5.3.0",
|
||||||
|
"tecnickcom/tcpdf": "~6.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"atoum/atoum": "^2.8 | ^3.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"Smalot\\PdfParser\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"LGPL-3.0"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastien MALOT",
|
||||||
|
"email": "sebastien@malot.fr"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Pdf parser library. Can read and extract information from pdf file.",
|
||||||
|
"homepage": "http://www.pdfparser.org",
|
||||||
|
"keywords": [
|
||||||
|
"extract",
|
||||||
|
"parse",
|
||||||
|
"parser",
|
||||||
|
"pdf",
|
||||||
|
"text"
|
||||||
|
],
|
||||||
|
"time": "2019-01-11T08:49:57+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tecnickcom/tcpdf",
|
||||||
|
"version": "6.2.26",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/tecnickcom/TCPDF.git",
|
||||||
|
"reference": "367241059ca166e3a76490f4448c284e0a161f15"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/367241059ca166e3a76490f4448c284e0a161f15",
|
||||||
|
"reference": "367241059ca166e3a76490f4448c284e0a161f15",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -347,7 +587,6 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"classmap": [
|
"classmap": [
|
||||||
"fonts",
|
|
||||||
"config",
|
"config",
|
||||||
"include",
|
"include",
|
||||||
"tcpdf.php",
|
"tcpdf.php",
|
||||||
@ -368,13 +607,13 @@
|
|||||||
},
|
},
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
"license": [
|
"license": [
|
||||||
"LGPLv3"
|
"LGPL-3.0"
|
||||||
],
|
],
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "Nicola Asuni",
|
"name": "Nicola Asuni",
|
||||||
"email": "info@tecnick.com",
|
"email": "info@tecnick.com",
|
||||||
"homepage": "http://nicolaasuni.tecnick.com"
|
"role": "lead"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
|
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
|
||||||
@ -388,7 +627,7 @@
|
|||||||
"pdf417",
|
"pdf417",
|
||||||
"qrcode"
|
"qrcode"
|
||||||
],
|
],
|
||||||
"time": "2015-09-12 10:08:34"
|
"time": "2018-10-16T17:24:05+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
@ -444,7 +683,7 @@
|
|||||||
"constructor",
|
"constructor",
|
||||||
"instantiate"
|
"instantiate"
|
||||||
],
|
],
|
||||||
"time": "2015-06-14 21:17:01"
|
"time": "2015-06-14T21:17:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "jakub-onderka/php-console-color",
|
"name": "jakub-onderka/php-console-color",
|
||||||
@ -487,7 +726,7 @@
|
|||||||
"homepage": "http://www.acci.cz"
|
"homepage": "http://www.acci.cz"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2014-04-08 15:00:19"
|
"time": "2014-04-08T15:00:19+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "jakub-onderka/php-console-highlighter",
|
"name": "jakub-onderka/php-console-highlighter",
|
||||||
@ -531,7 +770,7 @@
|
|||||||
"homepage": "http://www.acci.cz/"
|
"homepage": "http://www.acci.cz/"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2015-04-20 18:58:01"
|
"time": "2015-04-20T18:58:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "jakub-onderka/php-parallel-lint",
|
"name": "jakub-onderka/php-parallel-lint",
|
||||||
@ -578,7 +817,7 @@
|
|||||||
],
|
],
|
||||||
"description": "This tool check syntax of PHP files about 20x faster than serial check.",
|
"description": "This tool check syntax of PHP files about 20x faster than serial check.",
|
||||||
"homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
|
"homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
|
||||||
"time": "2015-12-15 10:42:16"
|
"time": "2015-12-15T10:42:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/reflection-common",
|
"name": "phpdocumentor/reflection-common",
|
||||||
@ -632,7 +871,7 @@
|
|||||||
"reflection",
|
"reflection",
|
||||||
"static analysis"
|
"static analysis"
|
||||||
],
|
],
|
||||||
"time": "2015-12-27 11:43:31"
|
"time": "2015-12-27T11:43:31+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/reflection-docblock",
|
"name": "phpdocumentor/reflection-docblock",
|
||||||
@ -677,7 +916,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
|
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
|
||||||
"time": "2016-09-30 07:12:33"
|
"time": "2016-09-30T07:12:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/type-resolver",
|
"name": "phpdocumentor/type-resolver",
|
||||||
@ -724,7 +963,7 @@
|
|||||||
"email": "me@mikevanriel.com"
|
"email": "me@mikevanriel.com"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2016-06-10 07:14:17"
|
"time": "2016-06-10T07:14:17+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpspec/prophecy",
|
"name": "phpspec/prophecy",
|
||||||
@ -786,7 +1025,7 @@
|
|||||||
"spy",
|
"spy",
|
||||||
"stub"
|
"stub"
|
||||||
],
|
],
|
||||||
"time": "2016-06-07 08:13:47"
|
"time": "2016-06-07T08:13:47+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
@ -848,7 +1087,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2015-10-06 15:47:00"
|
"time": "2015-10-06T15:47:00+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-file-iterator",
|
"name": "phpunit/php-file-iterator",
|
||||||
@ -895,7 +1134,7 @@
|
|||||||
"filesystem",
|
"filesystem",
|
||||||
"iterator"
|
"iterator"
|
||||||
],
|
],
|
||||||
"time": "2015-06-21 13:08:43"
|
"time": "2015-06-21T13:08:43+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-text-template",
|
"name": "phpunit/php-text-template",
|
||||||
@ -936,7 +1175,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"template"
|
"template"
|
||||||
],
|
],
|
||||||
"time": "2015-06-21 13:50:34"
|
"time": "2015-06-21T13:50:34+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-timer",
|
"name": "phpunit/php-timer",
|
||||||
@ -980,7 +1219,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"timer"
|
"timer"
|
||||||
],
|
],
|
||||||
"time": "2016-05-12 18:03:57"
|
"time": "2016-05-12T18:03:57+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-token-stream",
|
"name": "phpunit/php-token-stream",
|
||||||
@ -1029,7 +1268,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"tokenizer"
|
"tokenizer"
|
||||||
],
|
],
|
||||||
"time": "2015-09-15 10:49:45"
|
"time": "2015-09-15T10:49:45+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
@ -1101,7 +1340,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2016-07-21 06:48:14"
|
"time": "2016-07-21T06:48:14+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-mock-objects",
|
"name": "phpunit/phpunit-mock-objects",
|
||||||
@ -1157,7 +1396,7 @@
|
|||||||
"mock",
|
"mock",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2015-10-02 06:51:40"
|
"time": "2015-10-02T06:51:40+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit-selenium",
|
"name": "phpunit/phpunit-selenium",
|
||||||
@ -1221,7 +1460,7 @@
|
|||||||
"testing",
|
"testing",
|
||||||
"xunit"
|
"xunit"
|
||||||
],
|
],
|
||||||
"time": "2016-03-01 10:33:56"
|
"time": "2016-03-01T10:33:56+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/comparator",
|
"name": "sebastian/comparator",
|
||||||
@ -1285,7 +1524,7 @@
|
|||||||
"compare",
|
"compare",
|
||||||
"equality"
|
"equality"
|
||||||
],
|
],
|
||||||
"time": "2015-07-26 15:48:44"
|
"time": "2015-07-26T15:48:44+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/diff",
|
"name": "sebastian/diff",
|
||||||
@ -1337,7 +1576,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"diff"
|
"diff"
|
||||||
],
|
],
|
||||||
"time": "2015-12-08 07:14:41"
|
"time": "2015-12-08T07:14:41+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/environment",
|
"name": "sebastian/environment",
|
||||||
@ -1387,7 +1626,7 @@
|
|||||||
"environment",
|
"environment",
|
||||||
"hhvm"
|
"hhvm"
|
||||||
],
|
],
|
||||||
"time": "2016-08-18 05:49:44"
|
"time": "2016-08-18T05:49:44+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/exporter",
|
"name": "sebastian/exporter",
|
||||||
@ -1454,7 +1693,7 @@
|
|||||||
"export",
|
"export",
|
||||||
"exporter"
|
"exporter"
|
||||||
],
|
],
|
||||||
"time": "2016-06-17 09:04:28"
|
"time": "2016-06-17T09:04:28+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/global-state",
|
"name": "sebastian/global-state",
|
||||||
@ -1505,7 +1744,7 @@
|
|||||||
"keywords": [
|
"keywords": [
|
||||||
"global state"
|
"global state"
|
||||||
],
|
],
|
||||||
"time": "2015-10-12 03:26:01"
|
"time": "2015-10-12T03:26:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/recursion-context",
|
"name": "sebastian/recursion-context",
|
||||||
@ -1558,7 +1797,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Provides functionality to recursively process PHP variables",
|
"description": "Provides functionality to recursively process PHP variables",
|
||||||
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
|
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
|
||||||
"time": "2015-11-11 19:50:13"
|
"time": "2015-11-11T19:50:13+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/version",
|
"name": "sebastian/version",
|
||||||
@ -1593,7 +1832,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
|
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
|
||||||
"homepage": "https://github.com/sebastianbergmann/version",
|
"homepage": "https://github.com/sebastianbergmann/version",
|
||||||
"time": "2015-06-21 13:59:46"
|
"time": "2015-06-21T13:59:46+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "squizlabs/php_codesniffer",
|
"name": "squizlabs/php_codesniffer",
|
||||||
@ -1671,7 +1910,7 @@
|
|||||||
"phpcs",
|
"phpcs",
|
||||||
"standards"
|
"standards"
|
||||||
],
|
],
|
||||||
"time": "2016-09-01 23:53:02"
|
"time": "2016-09-01T23:53:02+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/yaml",
|
"name": "symfony/yaml",
|
||||||
@ -1720,7 +1959,7 @@
|
|||||||
],
|
],
|
||||||
"description": "Symfony Yaml Component",
|
"description": "Symfony Yaml Component",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"time": "2016-10-24 18:41:13"
|
"time": "2016-10-24T18:41:13+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "webmozart/assert",
|
"name": "webmozart/assert",
|
||||||
@ -1770,7 +2009,7 @@
|
|||||||
"check",
|
"check",
|
||||||
"validate"
|
"validate"
|
||||||
],
|
],
|
||||||
"time": "2016-08-09 15:02:57"
|
"time": "2016-08-09T15:02:57+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
|
|||||||
@ -41,30 +41,6 @@ define('QR_FIND_FROM_RANDOM', false);
|
|||||||
|
|
||||||
* Removed useless directories ("examples", "tools")
|
* Removed useless directories ("examples", "tools")
|
||||||
|
|
||||||
* Fix
|
|
||||||
// initialize subsetchars
|
|
||||||
$subsetchars = array();
|
|
||||||
into
|
|
||||||
// initialize subsetchars
|
|
||||||
$subsetchars = array_fill(0, 256, true);
|
|
||||||
|
|
||||||
* Replace the continue into switch with a break:
|
|
||||||
|
|
||||||
case 're': {
|
|
||||||
// justify block
|
|
||||||
if (!TCPDF_STATIC::empty_string($this->lispacer)) {
|
|
||||||
$this->lispacer = '';
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
into
|
|
||||||
case 're': {
|
|
||||||
// justify block
|
|
||||||
if (!TCPDF_STATIC::empty_string($this->lispacer)) {
|
|
||||||
$this->lispacer = '';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
* Optionnaly, removed all fonts except
|
* Optionnaly, removed all fonts except
|
||||||
dejavusans* (used by greek, arab, persan, romanian, turkish),
|
dejavusans* (used by greek, arab, persan, romanian, turkish),
|
||||||
freemono* (russian),
|
freemono* (russian),
|
||||||
@ -72,7 +48,7 @@ case 're': {
|
|||||||
helvetica* (all other languages),
|
helvetica* (all other languages),
|
||||||
zapfdingbats.php (for special chars like form checkboxes)
|
zapfdingbats.php (for special chars like form checkboxes)
|
||||||
|
|
||||||
* Optionnaly, made freemono the default monotype font because we removed courier
|
* Optionnaly, made freemono the default monotype font if we removed courier
|
||||||
In htdocs/includes/tcpdf/tcpdf.php
|
In htdocs/includes/tcpdf/tcpdf.php
|
||||||
- protected $default_monospaced_font = 'courier';
|
- protected $default_monospaced_font = 'courier';
|
||||||
+ protected $default_monospaced_font = 'freemono';
|
+ protected $default_monospaced_font = 'freemono';
|
||||||
@ -133,6 +109,13 @@ JQUERYFILETREE:
|
|||||||
* Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
|
* Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
|
||||||
|
|
||||||
|
|
||||||
|
PHPEXCEL:
|
||||||
|
---------
|
||||||
|
* Replace in htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
|
||||||
|
continue;
|
||||||
|
with:
|
||||||
|
continue 2;
|
||||||
|
|
||||||
|
|
||||||
RESTLER:
|
RESTLER:
|
||||||
--------
|
--------
|
||||||
@ -149,7 +132,7 @@ to get
|
|||||||
if ($className == 'Luracast\Restler\mixed') return;
|
if ($className == 'Luracast\Restler\mixed') return;
|
||||||
...
|
...
|
||||||
|
|
||||||
Change also file Luracast/Restler/explorer/index.html
|
Change also content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
|
||||||
|
|
||||||
+With swagger 2:
|
+With swagger 2:
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
Example fo recurring event, 1 week, no end, exported by Google
|
Example fo recurring event, 1 week, no end, exported by Google
|
||||||
|
|
||||||
# The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then
|
# The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then
|
||||||
# first occurence was moved on tuesday. So this record were added.
|
# first occurrence was moved on tuesday. So this record were added.
|
||||||
BEGIN:VEVENT
|
BEGIN:VEVENT
|
||||||
DTSTART;TZID=Europe/Paris:20150519T100000
|
DTSTART;TZID=Europe/Paris:20150519T100000
|
||||||
DTEND;TZID=Europe/Paris:20150519T110000
|
DTEND;TZID=Europe/Paris:20150519T110000
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
README (English)
|
README (English)
|
||||||
--------------------------------
|
--------------------------------
|
||||||
|
|
||||||
This directory contains example of well formated mail messages.
|
This directory contains example of well formatted mail messages.
|
||||||
This is to help to build the CMailFile.class.php code.
|
This is to help to build the CMailFile.class.php code.
|
||||||
|
|||||||
@ -93,7 +93,7 @@ if (! $confirmed)
|
|||||||
$input = trim(fgets(STDIN));
|
$input = trim(fgets(STDIN));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Open input and ouput files
|
// Open input and output files
|
||||||
$fhandle = fopen($filepath, 'r');
|
$fhandle = fopen($filepath, 'r');
|
||||||
if (! $fhandle)
|
if (! $fhandle)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -93,7 +93,7 @@ if (! $confirmed)
|
|||||||
$input = trim(fgets(STDIN));
|
$input = trim(fgets(STDIN));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Open input and ouput files
|
// Open input and output files
|
||||||
$fhandle = fopen($filepath, 'r');
|
$fhandle = fopen($filepath, 'r');
|
||||||
if (! $fhandle)
|
if (! $fhandle)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -93,7 +93,7 @@ if (! $confirmed)
|
|||||||
$input = trim(fgets(STDIN));
|
$input = trim(fgets(STDIN));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Open input and ouput files
|
// Open input and output files
|
||||||
$fhandle = fopen($filepath, 'r');
|
$fhandle = fopen($filepath, 'r');
|
||||||
if (! $fhandle)
|
if (! $fhandle)
|
||||||
{
|
{
|
||||||
|
|||||||
1
dev/resources/facturx-zugferd/README.txt
Normal file
1
dev/resources/facturx-zugferd/README.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
See https://github.com/atgp/factur-x
|
||||||
@ -118,9 +118,6 @@
|
|||||||
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
|
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
|
||||||
<severity>0</severity>
|
<severity>0</severity>
|
||||||
</rule>
|
</rule>
|
||||||
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
|
|
||||||
<severity>0</severity>
|
|
||||||
</rule>
|
|
||||||
|
|
||||||
<!-- Tweaks to metrics -->
|
<!-- Tweaks to metrics -->
|
||||||
<rule ref="Generic.Metrics.CyclomaticComplexity">
|
<rule ref="Generic.Metrics.CyclomaticComplexity">
|
||||||
@ -166,7 +163,7 @@
|
|||||||
<!-- Disallow usage of tab -->
|
<!-- Disallow usage of tab -->
|
||||||
<!-- <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
|
<!-- <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
|
||||||
|
|
||||||
<!-- Check indent are done with spaces and wiht correct number -->
|
<!-- Check indent are done with spaces and with correct number -->
|
||||||
<!-- Disabled as this does not support tab -->
|
<!-- Disabled as this does not support tab -->
|
||||||
<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
|
<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
|
||||||
|
|
||||||
@ -348,12 +345,6 @@
|
|||||||
</rule>
|
</rule>
|
||||||
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
|
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
|
||||||
<severity>0</severity>
|
<severity>0</severity>
|
||||||
</rule>
|
|
||||||
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
|
|
||||||
<severity>0</severity>
|
|
||||||
</rule>
|
|
||||||
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
|
|
||||||
<severity>0</severity>
|
|
||||||
</rule>
|
</rule>
|
||||||
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
|
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
|
||||||
<severity>0</severity>
|
<severity>0</severity>
|
||||||
|
|||||||
@ -4,7 +4,7 @@ This directory contains tools to generate translation files for a new
|
|||||||
languages or to update translation files for existing languages.
|
languages or to update translation files for existing languages.
|
||||||
See Dolibarr Wiki page:
|
See Dolibarr Wiki page:
|
||||||
http://wiki.dolibarr.org/index.php/Translator_documentation
|
http://wiki.dolibarr.org/index.php/Translator_documentation
|
||||||
For more informations on how to use them.
|
For more information on how to use them.
|
||||||
|
|
||||||
To install transifex client:
|
To install transifex client:
|
||||||
sudo pip install --upgrade transifex-client
|
sudo pip install --upgrade transifex-client
|
||||||
|
|||||||
@ -188,7 +188,7 @@ if ($action == 'update') {
|
|||||||
|
|
||||||
$form = new FormAccounting($db);
|
$form = new FormAccounting($db);
|
||||||
|
|
||||||
// Defaut AccountingAccount RowId Product / Service
|
// Default AccountingAccount RowId Product / Service
|
||||||
// at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
|
// at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
|
||||||
// so we need to get those default value rowid first
|
// so we need to get those default value rowid first
|
||||||
$accounting = new AccountingAccount($db);
|
$accounting = new AccountingAccount($db);
|
||||||
|
|||||||
@ -248,7 +248,7 @@ class BookKeeping extends CommonObject
|
|||||||
|
|
||||||
// First check if line not yet already in bookkeeping.
|
// First check if line not yet already in bookkeeping.
|
||||||
// Note that we must include doc_type - fk_doc - numero_compte - label to be sure to have unicity of line (we may have several lines
|
// Note that we must include doc_type - fk_doc - numero_compte - label to be sure to have unicity of line (we may have several lines
|
||||||
// with same doc_type, fk_odc, numero_compte for 1 invoice line when using localtaxes with same account)
|
// with same doc_type, fk_doc, numero_compte for 1 invoice line when using localtaxes with same account)
|
||||||
// WARNING: This is not reliable, label may have been modified. This is just a small protection.
|
// WARNING: This is not reliable, label may have been modified. This is just a small protection.
|
||||||
// The page to make journalization make the test on couple doc_type - fk_doc only.
|
// The page to make journalization make the test on couple doc_type - fk_doc only.
|
||||||
$sql = "SELECT count(*) as nb";
|
$sql = "SELECT count(*) as nb";
|
||||||
@ -1700,11 +1700,11 @@ class BookKeeping extends CommonObject
|
|||||||
$error++;
|
$error++;
|
||||||
}
|
}
|
||||||
$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'(doc_date, doc_type,';
|
$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'(doc_date, doc_type,';
|
||||||
$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
|
$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
|
||||||
$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
|
$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
|
||||||
$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
|
$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
|
||||||
$sql .= 'SELECT doc_date, doc_type,';
|
$sql .= 'SELECT doc_date, doc_type,';
|
||||||
$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
|
$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
|
||||||
$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
|
$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
|
||||||
$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.$next_piecenum.'';
|
$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.$next_piecenum.'';
|
||||||
$sql .= ' FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
|
$sql .= ' FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;
|
||||||
|
|||||||
@ -608,7 +608,7 @@ if ($rowid > 0)
|
|||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
|
print_liste_field_titre("NameSlashCompany", $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
|
print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Nature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
|
print_liste_field_titre("Nature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
|
print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
|
||||||
|
|||||||
@ -352,7 +352,6 @@ if ($result)
|
|||||||
{
|
{
|
||||||
$obj = $db->fetch_object($result);
|
$obj = $db->fetch_object($result);
|
||||||
|
|
||||||
|
|
||||||
print "\n";
|
print "\n";
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
@ -383,10 +382,7 @@ if ($result)
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($conf->multicompany->enabled) && !$user->entity)
|
|
||||||
{
|
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
}
|
|
||||||
|
|
||||||
// Actions
|
// Actions
|
||||||
print '<td align="center">';
|
print '<td align="center">';
|
||||||
@ -416,7 +412,6 @@ else
|
|||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
|
/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
|
||||||
* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@inodbox.com>
|
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||||
|
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -256,7 +257,7 @@ if ($action == 'delete')
|
|||||||
print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';
|
print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';
|
||||||
print '<input type="hidden" action="change_menu_handler">';
|
print '<input type="hidden" action="change_menu_handler">';
|
||||||
print $langs->trans("MenuHandler").': ';
|
print $langs->trans("MenuHandler").': ';
|
||||||
print $formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler)?'':'_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));
|
$formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler)?'':'_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));
|
||||||
print ' <input type="submit" class="button" value="'.$langs->trans("Refresh").'">';
|
print ' <input type="submit" class="button" value="'.$langs->trans("Refresh").'">';
|
||||||
print '</form>';
|
print '</form>';
|
||||||
|
|
||||||
|
|||||||
@ -281,10 +281,10 @@ if ($mode == 'overwrite')
|
|||||||
print '<div class="div-table-responsive-no-min">';
|
print '<div class="div-table-responsive-no-min">';
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre( $langs->trans("Language").' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
|
||||||
//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
|
//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
|
||||||
print '<td align="center"></td>';
|
print '<td align="center"></td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -470,7 +470,7 @@ if ($mode == 'searchkey')
|
|||||||
print '<div class="div-table-responsive-no-min">';
|
print '<div class="div-table-responsive-no-min">';
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre( $langs->trans("Language").' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder).'</td>';
|
print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder).'</td>';
|
||||||
print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
|
||||||
//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
|
//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
|
||||||
|
|||||||
@ -43,7 +43,7 @@ Develop an API
|
|||||||
|
|
||||||
The API uses Lucarast Restler framework. Please check documentation https://www.luracast.com/products/restler and examples http://help.luracast.com/restler/examples/
|
The API uses Lucarast Restler framework. Please check documentation https://www.luracast.com/products/restler and examples http://help.luracast.com/restler/examples/
|
||||||
|
|
||||||
Github contains also usefull informations : https://github.com/Luracast/Restler
|
Github contains also useful information : https://github.com/Luracast/Restler
|
||||||
|
|
||||||
To implement it into Dolibarr, you need to create a specific class for object we want to use. A skeleton file is available into /modulebuilder/class directory : *api_mymodule_class.class.php*
|
To implement it into Dolibarr, you need to create a specific class for object we want to use. A skeleton file is available into /modulebuilder/class directory : *api_mymodule_class.class.php*
|
||||||
The API class file must be put into object class directory, with specific file name. By example, API class file for '*myobject*' must be put as : /htdocs/*myobject*/class/api_*myobject*.class.php. Class must be named **MyobjectApi**.
|
The API class file must be put into object class directory, with specific file name. By example, API class file for '*myobject*' must be put as : /htdocs/*myobject*/class/api_*myobject*.class.php. Class must be named **MyobjectApi**.
|
||||||
@ -67,6 +67,6 @@ It is possible to specify url for API methods by simply use the PHPDoc tag **@ur
|
|||||||
**Other Annotations**
|
**Other Annotations**
|
||||||
Other annotations are used, you are encouraged to read them : https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md
|
Other annotations are used, you are encouraged to read them : https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md
|
||||||
|
|
||||||
PHPDoc tags can also be used to specify variables informations for API. Again, rtfm : https://github.com/Luracast/Restler/blob/master/PARAM.md
|
PHPDoc tags can also be used to specify variables information for API. Again, rtfm : https://github.com/Luracast/Restler/blob/master/PARAM.md
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -58,7 +58,7 @@ class ActionCommReminder extends CommonObject
|
|||||||
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
|
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
|
||||||
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
|
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
|
||||||
* 'index' if we want an index in database.
|
* 'index' if we want an index in database.
|
||||||
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
|
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
|
||||||
* 'position' is the sort order of field.
|
* 'position' is the sort order of field.
|
||||||
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
|
||||||
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
|
||||||
|
|||||||
@ -109,7 +109,7 @@ class ICal
|
|||||||
|
|
||||||
$this->file_text = preg_split("[\n]", $this->file_text);
|
$this->file_text = preg_split("[\n]", $this->file_text);
|
||||||
|
|
||||||
// is this text vcalendar standart text ? on line 1 is BEGIN:VCALENDAR
|
// is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
|
||||||
if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
|
if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
|
||||||
|
|
||||||
$insidealarm=0;
|
$insidealarm=0;
|
||||||
|
|||||||
@ -528,7 +528,7 @@ class Mailing extends CommonObject
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a link to the object card (with optionaly the picto)
|
* Return a link to the object card (with optionally the picto)
|
||||||
*
|
*
|
||||||
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
|
||||||
* @param string $option On what the link point to ('nolink', ...)
|
* @param string $option On what the link point to ('nolink', ...)
|
||||||
|
|||||||
@ -120,7 +120,6 @@ if ($id > 0 || ! empty($ref))
|
|||||||
{
|
{
|
||||||
$result=$object->fetch($id, $ref);
|
$result=$object->fetch($id, $ref);
|
||||||
$search_account = $object->id; // Force the search field on id of account
|
$search_account = $object->id; // Force the search field on id of account
|
||||||
}
|
|
||||||
|
|
||||||
if (! ($object->id > 0) )
|
if (! ($object->id > 0) )
|
||||||
{
|
{
|
||||||
@ -128,6 +127,8 @@ if (! ($object->id > 0) )
|
|||||||
print($langs->trans('ErrorRecordNotFound'));
|
print($langs->trans('ErrorRecordNotFound'));
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
|
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
|
||||||
$hookmanager->initHooks(array('banktransactionlist', $contextpage));
|
$hookmanager->initHooks(array('banktransactionlist', $contextpage));
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
/* Copyright (C) 2017-2019 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||||
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -71,6 +71,8 @@ class PaymentVarious extends CommonObject
|
|||||||
|
|
||||||
public $accountancy_code;
|
public $accountancy_code;
|
||||||
|
|
||||||
|
public $subledger_account;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int ID
|
* @var int ID
|
||||||
*/
|
*/
|
||||||
@ -139,6 +141,7 @@ class PaymentVarious extends CommonObject
|
|||||||
$sql.= " label='".$this->db->escape($this->label)."',";
|
$sql.= " label='".$this->db->escape($this->label)."',";
|
||||||
$sql.= " note='".$this->db->escape($this->note)."',";
|
$sql.= " note='".$this->db->escape($this->note)."',";
|
||||||
$sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
|
$sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
|
||||||
|
$sql.= " subledger_account='".$this->db->escape($this->subledger_account)."',";
|
||||||
$sql.= " fk_projet='".$this->db->escape($this->fk_project)."',";
|
$sql.= " fk_projet='".$this->db->escape($this->fk_project)."',";
|
||||||
$sql.= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank:"null").",";
|
$sql.= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank:"null").",";
|
||||||
$sql.= " fk_user_author=".$this->fk_user_author.",";
|
$sql.= " fk_user_author=".$this->fk_user_author.",";
|
||||||
@ -196,6 +199,7 @@ class PaymentVarious extends CommonObject
|
|||||||
$sql.= " v.label,";
|
$sql.= " v.label,";
|
||||||
$sql.= " v.note,";
|
$sql.= " v.note,";
|
||||||
$sql.= " v.accountancy_code,";
|
$sql.= " v.accountancy_code,";
|
||||||
|
$sql.= " v.subledger_account,";
|
||||||
$sql.= " v.fk_projet as fk_project,";
|
$sql.= " v.fk_projet as fk_project,";
|
||||||
$sql.= " v.fk_bank,";
|
$sql.= " v.fk_bank,";
|
||||||
$sql.= " v.fk_user_author,";
|
$sql.= " v.fk_user_author,";
|
||||||
@ -226,6 +230,7 @@ class PaymentVarious extends CommonObject
|
|||||||
$this->num_payment = $obj->num_payment;
|
$this->num_payment = $obj->num_payment;
|
||||||
$this->label = $obj->label;
|
$this->label = $obj->label;
|
||||||
$this->note = $obj->note;
|
$this->note = $obj->note;
|
||||||
|
$this->subledger_account = $obj->subledger_account;
|
||||||
$this->accountancy_code = $obj->accountancy_code;
|
$this->accountancy_code = $obj->accountancy_code;
|
||||||
$this->fk_project = $obj->fk_project;
|
$this->fk_project = $obj->fk_project;
|
||||||
$this->fk_bank = $obj->fk_bank;
|
$this->fk_bank = $obj->fk_bank;
|
||||||
@ -298,6 +303,7 @@ class PaymentVarious extends CommonObject
|
|||||||
$this->amount='';
|
$this->amount='';
|
||||||
$this->label='';
|
$this->label='';
|
||||||
$this->accountancy_code='';
|
$this->accountancy_code='';
|
||||||
|
$this->subledger_account='';
|
||||||
$this->note='';
|
$this->note='';
|
||||||
$this->fk_bank='';
|
$this->fk_bank='';
|
||||||
$this->fk_user_author='';
|
$this->fk_user_author='';
|
||||||
@ -360,6 +366,7 @@ class PaymentVarious extends CommonObject
|
|||||||
if ($this->note) $sql.= ", note";
|
if ($this->note) $sql.= ", note";
|
||||||
$sql.= ", label";
|
$sql.= ", label";
|
||||||
$sql.= ", accountancy_code";
|
$sql.= ", accountancy_code";
|
||||||
|
$sql.= ", subledger_account";
|
||||||
$sql.= ", fk_projet";
|
$sql.= ", fk_projet";
|
||||||
$sql.= ", fk_user_author";
|
$sql.= ", fk_user_author";
|
||||||
$sql.= ", datec";
|
$sql.= ", datec";
|
||||||
@ -376,6 +383,7 @@ class PaymentVarious extends CommonObject
|
|||||||
if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
|
if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
|
||||||
$sql.= ", '".$this->db->escape($this->label)."'";
|
$sql.= ", '".$this->db->escape($this->label)."'";
|
||||||
$sql.= ", '".$this->db->escape($this->accountancy_code)."'";
|
$sql.= ", '".$this->db->escape($this->accountancy_code)."'";
|
||||||
|
$sql.= ", '".$this->db->escape($this->subledger_account)."'";
|
||||||
$sql.= ", ".($this->fk_project > 0? $this->fk_project : 0);
|
$sql.= ", ".($this->fk_project > 0? $this->fk_project : 0);
|
||||||
$sql.= ", ".$user->id;
|
$sql.= ", ".$user->id;
|
||||||
$sql.= ", '".$this->db->idate($now)."'";
|
$sql.= ", '".$this->db->idate($now)."'";
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
/* Copyright (C) 2017-2019 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||||
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -48,9 +48,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
|
|||||||
$accountid=GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
|
$accountid=GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
|
||||||
$label=GETPOST("label", "alpha");
|
$label=GETPOST("label", "alpha");
|
||||||
$sens=GETPOST("sens", "int");
|
$sens=GETPOST("sens", "int");
|
||||||
$amount=GETPOST("amount");
|
$amount=GETPOST("amount", "alpha");
|
||||||
$paymenttype=GETPOST("paymenttype");
|
$paymenttype=GETPOST("paymenttype", "int");
|
||||||
$accountancy_code=GETPOST("accountancy_code", "int");
|
$accountancy_code=GETPOST("accountancy_code", "int");
|
||||||
|
$subledger_account=GETPOST("subledger_account", "int");
|
||||||
$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
|
$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
|
||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
@ -112,7 +113,10 @@ if (empty($reshook))
|
|||||||
$object->type_payment=GETPOST("paymenttype", 'int') > 0 ? GETPOST("paymenttype", "int") : 0;
|
$object->type_payment=GETPOST("paymenttype", 'int') > 0 ? GETPOST("paymenttype", "int") : 0;
|
||||||
$object->num_payment=GETPOST("num_payment", 'alpha');
|
$object->num_payment=GETPOST("num_payment", 'alpha');
|
||||||
$object->fk_user_author=$user->id;
|
$object->fk_user_author=$user->id;
|
||||||
|
|
||||||
$object->accountancy_code=GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "int") : "";
|
$object->accountancy_code=GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "int") : "";
|
||||||
|
$object->subledger_account=GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "int") : "";
|
||||||
|
|
||||||
$object->sens=GETPOST('sens');
|
$object->sens=GETPOST('sens');
|
||||||
$object->fk_project= GETPOST('fk_project', 'int');
|
$object->fk_project= GETPOST('fk_project', 'int');
|
||||||
|
|
||||||
@ -325,6 +329,28 @@ if ($action == 'create')
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Subledger account
|
||||||
|
if (! empty($conf->accounting->enabled))
|
||||||
|
{
|
||||||
|
print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
|
||||||
|
print '<td>';
|
||||||
|
if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
|
||||||
|
{
|
||||||
|
print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print '<input type="text" name="subledger_account" value="'.$subledger_account.'">';
|
||||||
|
}
|
||||||
|
print '</td></tr>';
|
||||||
|
}
|
||||||
|
else // For external software
|
||||||
|
{
|
||||||
|
print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
|
||||||
|
print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="subledger_account" value="'.$subledger_account.'">';
|
||||||
|
print '</td></tr>';
|
||||||
|
}
|
||||||
|
|
||||||
// Project
|
// Project
|
||||||
if (! empty($conf->projet->enabled))
|
if (! empty($conf->projet->enabled))
|
||||||
{
|
{
|
||||||
@ -447,6 +473,13 @@ if ($id)
|
|||||||
}
|
}
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
|
// Subledger account
|
||||||
|
print '<tr><td class="nowrap">';
|
||||||
|
print $langs->trans("SubledgerAccount");
|
||||||
|
print '</td><td>';
|
||||||
|
print $object->subledger_account;
|
||||||
|
print '</td></tr>';
|
||||||
|
|
||||||
if (! empty($conf->banque->enabled))
|
if (! empty($conf->banque->enabled))
|
||||||
{
|
{
|
||||||
if ($object->fk_account > 0)
|
if ($object->fk_account > 0)
|
||||||
|
|||||||
@ -1171,7 +1171,7 @@ if ($action == 'create')
|
|||||||
|
|
||||||
if ($flag_price_may_change)
|
if ($flag_price_may_change)
|
||||||
{
|
{
|
||||||
print '<tr><td colspan="3" align="left">';
|
print '<tr><td colspan="3" class="left">';
|
||||||
print '<select name="usenewprice" class="flat">';
|
print '<select name="usenewprice" class="flat">';
|
||||||
print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>';
|
print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>';
|
||||||
print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>';
|
print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>';
|
||||||
@ -1306,7 +1306,7 @@ else
|
|||||||
print $langs->trans('PaymentConditionsShort');
|
print $langs->trans('PaymentConditionsShort');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
||||||
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
|
print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td>';
|
print '</td><td>';
|
||||||
if ($object->type != Facture::TYPE_CREDIT_NOTE)
|
if ($object->type != Facture::TYPE_CREDIT_NOTE)
|
||||||
@ -1330,7 +1330,7 @@ else
|
|||||||
print $langs->trans('PaymentMode');
|
print $langs->trans('PaymentMode');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
||||||
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
|
print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td>';
|
print '</td><td>';
|
||||||
if ($action == 'editmode')
|
if ($action == 'editmode')
|
||||||
@ -1393,7 +1393,7 @@ else
|
|||||||
print $langs->trans('RIB');
|
print $langs->trans('RIB');
|
||||||
print '<td>';
|
print '<td>';
|
||||||
if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
|
if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
|
||||||
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
|
print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td>';
|
print '</td><td>';
|
||||||
if ($action == 'editbankaccount')
|
if ($action == 'editbankaccount')
|
||||||
@ -1415,7 +1415,7 @@ else
|
|||||||
print $langs->trans('Model');
|
print $langs->trans('Model');
|
||||||
print '<td>';
|
print '<td>';
|
||||||
if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
|
if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
|
||||||
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
|
print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td>';
|
print '</td><td>';
|
||||||
if ($action == 'editmodelpdf')
|
if ($action == 'editmodelpdf')
|
||||||
@ -1464,7 +1464,7 @@ else
|
|||||||
print $langs->trans('Frequency');
|
print $langs->trans('Frequency');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
||||||
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
|
print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td>';
|
print '</td><td>';
|
||||||
if ($action == 'editfrequency')
|
if ($action == 'editfrequency')
|
||||||
|
|||||||
@ -348,47 +348,47 @@ if ($resql)
|
|||||||
// Ref
|
// Ref
|
||||||
if (! empty($arrayfields['f.titre']['checked']))
|
if (! empty($arrayfields['f.titre']['checked']))
|
||||||
{
|
{
|
||||||
print '<td class="liste_titre" align="left">';
|
print '<td class="liste_titre left">';
|
||||||
print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
// Thirpdarty
|
// Thirpdarty
|
||||||
if (! empty($arrayfields['s.nom']['checked']))
|
if (! empty($arrayfields['s.nom']['checked']))
|
||||||
{
|
{
|
||||||
print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
|
print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total']['checked']))
|
if (! empty($arrayfields['f.total']['checked']))
|
||||||
{
|
{
|
||||||
// Amount net
|
// Amount net
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.tva']['checked']))
|
if (! empty($arrayfields['f.tva']['checked']))
|
||||||
{
|
{
|
||||||
// Amount Vat
|
// Amount Vat
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total_ttc']['checked']))
|
if (! empty($arrayfields['f.total_ttc']['checked']))
|
||||||
{
|
{
|
||||||
// Amount
|
// Amount
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
|
if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
|
||||||
{
|
{
|
||||||
// Payment term
|
// Payment term
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
|
print $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
|
||||||
print "</td>";
|
print "</td>";
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
|
if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
|
||||||
{
|
{
|
||||||
// Payment mode
|
// Payment mode
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
|
print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
@ -479,12 +479,12 @@ if ($resql)
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
if (! empty($arrayfields['f.titre']['checked'])) print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $sortfield, $sortorder);
|
if (! empty($arrayfields['f.titre']['checked'])) print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder);
|
if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.total']['checked'])) print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.total']['checked'])) print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.tva']['checked'])) print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.tva']['checked'])) print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.fk_cond_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.fk_cond_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['recurring']['checked'])) print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'align="center"', $sortfield, $sortorder);
|
if (! empty($arrayfields['recurring']['checked'])) print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'class="center"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.frequency']['checked'])) print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.frequency']['checked'])) print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.nb_gen_done']['checked'])) print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.nb_gen_done']['checked'])) print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
@ -533,21 +533,21 @@ if ($resql)
|
|||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total']['checked']))
|
if (! empty($arrayfields['f.total']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($objp->total).'</td>'."\n";
|
print '<td class="right">'.price($objp->total).'</td>'."\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total';
|
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total';
|
||||||
$totalarray['val']['f.total'] += $objp->total;
|
$totalarray['val']['f.total'] += $objp->total;
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.tva']['checked']))
|
if (! empty($arrayfields['f.tva']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
|
print '<td class="right">'.price($objp->total_vat).'</td>'."\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva';
|
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva';
|
||||||
$totalarray['val']['f.tva'] += $objp->total_vat;
|
$totalarray['val']['f.tva'] += $objp->total_vat;
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total_ttc']['checked']))
|
if (! empty($arrayfields['f.total_ttc']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
|
print '<td class="right">'.price($objp->total_ttc).'</td>'."\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc';
|
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc';
|
||||||
$totalarray['val']['f.total_ttc'] += $objp->total_ttc;
|
$totalarray['val']['f.total_ttc'] += $objp->total_ttc;
|
||||||
@ -555,7 +555,7 @@ if ($resql)
|
|||||||
// Payment term
|
// Payment term
|
||||||
if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
|
if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
|
print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
|
||||||
print '</td>'."\n";
|
print '</td>'."\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
@ -563,7 +563,7 @@ if ($resql)
|
|||||||
// Payment mode
|
// Payment mode
|
||||||
if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
|
if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
|
print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
|
||||||
print '</td>'."\n";
|
print '</td>'."\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
@ -683,7 +683,7 @@ if ($resql)
|
|||||||
while ($i < $totalarray['nbfield'])
|
while ($i < $totalarray['nbfield'])
|
||||||
{
|
{
|
||||||
$i++;
|
$i++;
|
||||||
if (! empty($totalarray['pos'][$i])) print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
|
if (! empty($totalarray['pos'][$i])) print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ($i == 1)
|
if ($i == 1)
|
||||||
|
|||||||
@ -779,46 +779,46 @@ if ($resql)
|
|||||||
if (! empty($arrayfields['f.total_ht']['checked']))
|
if (! empty($arrayfields['f.total_ht']['checked']))
|
||||||
{
|
{
|
||||||
// Amount
|
// Amount
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total_vat']['checked']))
|
if (! empty($arrayfields['f.total_vat']['checked']))
|
||||||
{
|
{
|
||||||
// Amount
|
// Amount
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total_localtax1']['checked']))
|
if (! empty($arrayfields['f.total_localtax1']['checked']))
|
||||||
{
|
{
|
||||||
// Localtax1
|
// Localtax1
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total_localtax2']['checked']))
|
if (! empty($arrayfields['f.total_localtax2']['checked']))
|
||||||
{
|
{
|
||||||
// Localtax2
|
// Localtax2
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['f.total_ttc']['checked']))
|
if (! empty($arrayfields['f.total_ttc']['checked']))
|
||||||
{
|
{
|
||||||
// Amount
|
// Amount
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
|
print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['dynamount_payed']['checked']))
|
if (! empty($arrayfields['dynamount_payed']['checked']))
|
||||||
{
|
{
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
if (! empty($arrayfields['rtp']['checked']))
|
if (! empty($arrayfields['rtp']['checked']))
|
||||||
{
|
{
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
// Extra fields
|
// Extra fields
|
||||||
@ -843,7 +843,7 @@ if ($resql)
|
|||||||
// Status
|
// Status
|
||||||
if (! empty($arrayfields['f.fk_statut']['checked']))
|
if (! empty($arrayfields['f.fk_statut']['checked']))
|
||||||
{
|
{
|
||||||
print '<td class="liste_titre maxwidthonsmartphone" align="right">';
|
print '<td class="liste_titre maxwidthonsmartphone right">';
|
||||||
$liststatus=array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
|
$liststatus=array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
|
||||||
print $form->selectarray('search_status', $liststatus, $search_status, 1);
|
print $form->selectarray('search_status', $liststatus, $search_status, 1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
@ -869,13 +869,13 @@ if ($resql)
|
|||||||
if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
|
if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
|
if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
|
if (! empty($arrayfields['f.fk_mode_reglement']['checked'])) print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.total_ht']['checked'])) print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.total_ht']['checked'])) print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.total_vat']['checked'])) print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.total_vat']['checked'])) print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
// Extra fields
|
// Extra fields
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
|
||||||
// Hook fields
|
// Hook fields
|
||||||
@ -884,7 +884,7 @@ if ($resql)
|
|||||||
print $hookmanager->resPrint;
|
print $hookmanager->resPrint;
|
||||||
if (! empty($arrayfields['f.datec']['checked'])) print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.datec']['checked'])) print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.tms']['checked'])) print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.tms']['checked'])) print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
|
||||||
if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'align="right"', $sortfield, $sortorder);
|
if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
|
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -1084,7 +1084,7 @@ if ($resql)
|
|||||||
// Amount HT
|
// Amount HT
|
||||||
if (! empty($arrayfields['f.total_ht']['checked']))
|
if (! empty($arrayfields['f.total_ht']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($obj->total_ht)."</td>\n";
|
print '<td class="right">'.price($obj->total_ht)."</td>\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
|
||||||
$totalarray['totalht'] += $obj->total_ht;
|
$totalarray['totalht'] += $obj->total_ht;
|
||||||
@ -1092,7 +1092,7 @@ if ($resql)
|
|||||||
// Amount VAT
|
// Amount VAT
|
||||||
if (! empty($arrayfields['f.total_vat']['checked']))
|
if (! empty($arrayfields['f.total_vat']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($obj->total_vat)."</td>\n";
|
print '<td class="right">'.price($obj->total_vat)."</td>\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
|
||||||
$totalarray['totalvat'] += $obj->total_vat;
|
$totalarray['totalvat'] += $obj->total_vat;
|
||||||
@ -1100,7 +1100,7 @@ if ($resql)
|
|||||||
// Amount LocalTax1
|
// Amount LocalTax1
|
||||||
if (! empty($arrayfields['f.total_localtax1']['checked']))
|
if (! empty($arrayfields['f.total_localtax1']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($obj->total_localtax1)."</td>\n";
|
print '<td class="right">'.price($obj->total_localtax1)."</td>\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
|
||||||
$totalarray['totallocaltax1'] += $obj->total_localtax1;
|
$totalarray['totallocaltax1'] += $obj->total_localtax1;
|
||||||
@ -1108,7 +1108,7 @@ if ($resql)
|
|||||||
// Amount LocalTax2
|
// Amount LocalTax2
|
||||||
if (! empty($arrayfields['f.total_localtax2']['checked']))
|
if (! empty($arrayfields['f.total_localtax2']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($obj->total_localtax2)."</td>\n";
|
print '<td class="right">'.price($obj->total_localtax2)."</td>\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
|
||||||
$totalarray['totallocaltax2'] += $obj->total_localtax2;
|
$totalarray['totallocaltax2'] += $obj->total_localtax2;
|
||||||
@ -1116,7 +1116,7 @@ if ($resql)
|
|||||||
// Amount TTC
|
// Amount TTC
|
||||||
if (! empty($arrayfields['f.total_ttc']['checked']))
|
if (! empty($arrayfields['f.total_ttc']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.price($obj->total_ttc)."</td>\n";
|
print '<td class="right">'.price($obj->total_ttc)."</td>\n";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
|
||||||
$totalarray['totalttc'] += $obj->total_ttc;
|
$totalarray['totalttc'] += $obj->total_ttc;
|
||||||
@ -1124,7 +1124,7 @@ if ($resql)
|
|||||||
|
|
||||||
if (! empty($arrayfields['dynamount_payed']['checked']))
|
if (! empty($arrayfields['dynamount_payed']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.(! empty($totalpay)?price($totalpay, 0, $langs):' ').'</td>'; // TODO Use a denormalized field
|
print '<td class="right">'.(! empty($totalpay)?price($totalpay, 0, $langs):' ').'</td>'; // TODO Use a denormalized field
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
|
||||||
$totalarray['totalam'] += $totalpay;
|
$totalarray['totalam'] += $totalpay;
|
||||||
@ -1132,7 +1132,7 @@ if ($resql)
|
|||||||
|
|
||||||
if (! empty($arrayfields['rtp']['checked']))
|
if (! empty($arrayfields['rtp']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.(! empty($remaintopay)?price($remaintopay, 0, $langs):' ').'</td>'; // TODO Use a denormalized field
|
print '<td class="right">'.(! empty($remaintopay)?price($remaintopay, 0, $langs):' ').'</td>'; // TODO Use a denormalized field
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
|
if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
|
||||||
$totalarray['totalrtp'] += $remaintopay;
|
$totalarray['totalrtp'] += $remaintopay;
|
||||||
@ -1163,7 +1163,7 @@ if ($resql)
|
|||||||
// Status
|
// Status
|
||||||
if (! empty($arrayfields['f.fk_statut']['checked']))
|
if (! empty($arrayfields['f.fk_statut']['checked']))
|
||||||
{
|
{
|
||||||
print '<td align="right" class="nowrap">';
|
print '<td class="nowrap right">';
|
||||||
print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
|
print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
|
||||||
print "</td>";
|
print "</td>";
|
||||||
if (! $i) $totalarray['nbfield']++;
|
if (! $i) $totalarray['nbfield']++;
|
||||||
@ -1205,13 +1205,13 @@ if ($resql)
|
|||||||
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
|
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
|
||||||
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
|
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
|
||||||
}
|
}
|
||||||
elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
|
elseif ($totalarray['totalhtfield'] == $i) print '<td class="right">'.price($totalarray['totalht']).'</td>';
|
||||||
elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
|
elseif ($totalarray['totalvatfield'] == $i) print '<td class="right">'.price($totalarray['totalvat']).'</td>';
|
||||||
elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>';
|
elseif ($totalarray['totallocaltax1field'] == $i) print '<td class="right">'.price($totalarray['totallocaltax1']).'</td>';
|
||||||
elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
|
elseif ($totalarray['totallocaltax2field'] == $i) print '<td class="right">'.price($totalarray['totallocaltax2']).'</td>';
|
||||||
elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
|
elseif ($totalarray['totalttcfield'] == $i) print '<td class="right">'.price($totalarray['totalttc']).'</td>';
|
||||||
elseif ($totalarray['totalamfield'] == $i) print '<td align="right">'.price($totalarray['totalam']).'</td>';
|
elseif ($totalarray['totalamfield'] == $i) print '<td class="right">'.price($totalarray['totalam']).'</td>';
|
||||||
elseif ($totalarray['totalrtpfield'] == $i) print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
|
elseif ($totalarray['totalrtpfield'] == $i) print '<td class="right">'.price($totalarray['totalrtp']).'</td>';
|
||||||
else print '<td></td>';
|
else print '<td></td>';
|
||||||
}
|
}
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -274,7 +274,7 @@ if ($object->id > 0)
|
|||||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||||
print $langs->trans('DateInvoice');
|
print $langs->trans('DateInvoice');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
|
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td colspan="3">';
|
print '</td><td colspan="3">';
|
||||||
|
|
||||||
@ -301,7 +301,7 @@ if ($object->id > 0)
|
|||||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||||
print $langs->trans('PaymentConditionsShort');
|
print $langs->trans('PaymentConditionsShort');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
|
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td colspan="3">';
|
print '</td><td colspan="3">';
|
||||||
if ($object->type != Facture::TYPE_CREDIT_NOTE)
|
if ($object->type != Facture::TYPE_CREDIT_NOTE)
|
||||||
@ -326,7 +326,7 @@ if ($object->id > 0)
|
|||||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||||
print $langs->trans('DateMaxPayment');
|
print $langs->trans('DateMaxPayment');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
|
if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td colspan="3">';
|
print '</td><td colspan="3">';
|
||||||
if ($object->type != Facture::TYPE_CREDIT_NOTE)
|
if ($object->type != Facture::TYPE_CREDIT_NOTE)
|
||||||
@ -354,7 +354,7 @@ if ($object->id > 0)
|
|||||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||||
print $langs->trans('PaymentMode');
|
print $langs->trans('PaymentMode');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
|
if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td colspan="3">';
|
print '</td><td colspan="3">';
|
||||||
if ($action == 'editmode')
|
if ($action == 'editmode')
|
||||||
@ -373,7 +373,7 @@ if ($object->id > 0)
|
|||||||
print $langs->trans('BankAccount');
|
print $langs->trans('BankAccount');
|
||||||
print '<td>';
|
print '<td>';
|
||||||
if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
|
if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
|
||||||
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
|
print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td colspan="3">';
|
print '</td><td colspan="3">';
|
||||||
if ($action == 'editbankaccount')
|
if ($action == 'editbankaccount')
|
||||||
@ -447,7 +447,7 @@ if ($object->id > 0)
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $user->rights->facture->creer)
|
||||||
{
|
{
|
||||||
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editrevenuestamp&facid=' . $object->id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . '</a></td>';
|
print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editrevenuestamp&facid=' . $object->id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . '</a></td>';
|
||||||
}
|
}
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td>';
|
print '</td><td>';
|
||||||
@ -615,7 +615,7 @@ if ($object->id > 0)
|
|||||||
|
|
||||||
print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
|
print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
|
||||||
|
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&did='.$obj->rowid.'">';
|
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&did='.$obj->rowid.'">';
|
||||||
print img_delete();
|
print img_delete();
|
||||||
print '</a></td>';
|
print '</a></td>';
|
||||||
|
|||||||
@ -182,7 +182,7 @@ print "<tr class=\"liste_titre\">";
|
|||||||
print "<td>".$langs->trans("Date")."</td>";
|
print "<td>".$langs->trans("Date")."</td>";
|
||||||
print "<td>".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")</td>";
|
print "<td>".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")</td>";
|
||||||
print "<td>".$langs->trans("Account")."</td>";
|
print "<td>".$langs->trans("Account")."</td>";
|
||||||
print "<td>".$langs->trans("Type")."</td><td align='right'>".$langs->trans("Debit")."</td><td align='right'>".$langs->trans("Credit")."</td>";
|
print "<td>".$langs->trans("Type")."</td><td class='right'>".$langs->trans("Debit")."</td><td class='right'>".$langs->trans("Credit")."</td>";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
|
|
||||||
@ -236,13 +236,13 @@ foreach ($tabfac as $key => $val)
|
|||||||
|
|
||||||
if (isset($line['inv']))
|
if (isset($line['inv']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
|
print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
|
||||||
print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
|
print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
|
print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
|
||||||
print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
|
print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</tr>";
|
print "</tr>";
|
||||||
|
|||||||
@ -211,7 +211,7 @@ print '<tr class="liste_titre">';
|
|||||||
//print "<td>".$langs->trans("JournalNum")."</td>";
|
//print "<td>".$langs->trans("JournalNum")."</td>";
|
||||||
print '<td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')</td>';
|
print '<td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')</td>';
|
||||||
print '<td>'.$langs->trans('Account').'</td>';
|
print '<td>'.$langs->trans('Account').'</td>';
|
||||||
print '<td>'.$langs->trans('Type').'</td><td align="right">'.$langs->trans('Debit').'</td><td align="right">'.$langs->trans('Credit').'</td>';
|
print '<td>'.$langs->trans('Type').'</td><td class="right">'.$langs->trans('Debit').'</td><td class="right">'.$langs->trans('Credit').'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
|
|
||||||
@ -266,13 +266,13 @@ foreach ($tabfac as $key => $val)
|
|||||||
|
|
||||||
if (isset($line['inv']))
|
if (isset($line['inv']))
|
||||||
{
|
{
|
||||||
print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
|
print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
|
||||||
print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
|
print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
|
print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
|
||||||
print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
|
print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</tr>";
|
print "</tr>";
|
||||||
|
|||||||
@ -157,13 +157,13 @@ $vatsup=$langs->transcountry($local==1?"LT1":"LT2", $mysoc->country_code);
|
|||||||
// IRPF that the customer has retained me
|
// IRPF that the customer has retained me
|
||||||
if($calc ==0 || $calc == 2)
|
if($calc ==0 || $calc == 2)
|
||||||
{
|
{
|
||||||
print "<table class=\"noborder\" width=\"100%\">";
|
print '<table class="noborder" width="100%">';
|
||||||
print "<tr class=\"liste_titre\">";
|
print '<tr class="liste_titre">';
|
||||||
print '<td class="left">'.$langs->trans("Num")."</td>";
|
print '<td class="left">'.$langs->trans("Num").'</td>';
|
||||||
print '<td class="left">'.$langs->trans("Customer")."</td>";
|
print '<td class="left">'.$langs->trans("Customer").'</td>';
|
||||||
print "<td>".$langs->transcountry("ProfId1", $mysoc->country_code)."</td>";
|
print '<td>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</td>';
|
||||||
print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
|
print '<td class="right">'.$langs->trans("TotalHT").'</td>';
|
||||||
print "<td align=\"right\">".$vatcust."</td>";
|
print '<td class="right">'.$vatcust.'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$coll_list = tax_by_thirdparty('localtax'.$local, $db, 0, $date_start, $date_end, $modetax, 'sell');
|
$coll_list = tax_by_thirdparty('localtax'.$local, $db, 0, $date_start, $date_end, $modetax, 'sell');
|
||||||
@ -208,9 +208,9 @@ if($calc ==0 || $calc == 2)
|
|||||||
print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
|
print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
|
||||||
$find = array(' ','.');
|
$find = array(' ','.');
|
||||||
$replace = array('','');
|
$replace = array('','');
|
||||||
print '<td class="nowrap">'.$intra."</td>";
|
print '<td class="nowrap">'.$intra.'</td>';
|
||||||
print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
|
print '<td class="nowrap right">'.price($coll->amount).'</td>';
|
||||||
print "<td class=\"nowrap\" align=\"right\">".price($local==1?$coll->localtax1:$coll->localtax2)."</td>";
|
print '<td class="nowrap right">'.price($local==1?$coll->localtax1:$coll->localtax2).'</td>';
|
||||||
$totalamount = $totalamount + $coll->amount;
|
$totalamount = $totalamount + $coll->amount;
|
||||||
$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
|
$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
@ -219,9 +219,9 @@ if($calc ==0 || $calc == 2)
|
|||||||
}
|
}
|
||||||
$x_coll_sum = $total;
|
$x_coll_sum = $total;
|
||||||
|
|
||||||
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
|
print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
|
||||||
print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
|
print '<td class="nowrap right">'.price($totalamount).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price($total).'</td>';
|
print '<td class="nowrap right">'.price($total).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -238,13 +238,13 @@ if($calc ==0 || $calc == 2)
|
|||||||
|
|
||||||
// IRPF I retained my supplier
|
// IRPF I retained my supplier
|
||||||
if($calc ==0 || $calc == 1){
|
if($calc ==0 || $calc == 1){
|
||||||
print "<table class=\"noborder\" width=\"100%\">";
|
print '<table class="noborder" width="100%">';
|
||||||
print "<tr class=\"liste_titre\">";
|
print '<tr class="liste_titre">';
|
||||||
print '<td class="left">'.$langs->trans("Num")."</td>";
|
print '<td class="left">'.$langs->trans("Num")."</td>";
|
||||||
print '<td class="left">'.$langs->trans("Supplier")."</td>";
|
print '<td class="left">'.$langs->trans("Supplier")."</td>";
|
||||||
print "<td>".$langs->transcountry("ProfId1", $mysoc->country_code)."</td>";
|
print '<td>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</td>';
|
||||||
print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
|
print '<td class="right">'.$langs->trans("TotalHT").'</td>';
|
||||||
print "<td align=\"right\">".$vatsup."</td>";
|
print '<td class="right">'.$vatsup.'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$company_static=new Societe($db);
|
$company_static=new Societe($db);
|
||||||
@ -283,8 +283,8 @@ if($calc ==0 || $calc == 1){
|
|||||||
$find = array(' ','.');
|
$find = array(' ','.');
|
||||||
$replace = array('','');
|
$replace = array('','');
|
||||||
print '<td class="nowrap">'.$intra."</td>";
|
print '<td class="nowrap">'.$intra."</td>";
|
||||||
print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
|
print '<td class="nowrap right">'.price($coll->amount).'</td>';
|
||||||
print "<td class=\"nowrap\" align=\"right\">".price($local==1?$coll->localtax1:$coll->localtax2)."</td>";
|
print '<td class="nowrap right">'.price($local==1?$coll->localtax1:$coll->localtax2).'</td>';
|
||||||
$totalamount = $totalamount + $coll->amount;
|
$totalamount = $totalamount + $coll->amount;
|
||||||
$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
|
$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
@ -293,9 +293,9 @@ if($calc ==0 || $calc == 1){
|
|||||||
}
|
}
|
||||||
$x_paye_sum = $total;
|
$x_paye_sum = $total;
|
||||||
|
|
||||||
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
|
print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
|
||||||
print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
|
print '<td class="nowrap right">'.price($totalamount).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price($total).'</td>';
|
print '<td class="nowrap right">'.price($total).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
@ -319,7 +319,7 @@ if($calc ==0){
|
|||||||
$diff = $x_coll_sum - $x_paye_sum ;
|
$diff = $x_coll_sum - $x_paye_sum ;
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
|
print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
|
||||||
print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
|
print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
}
|
}
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|||||||
@ -101,8 +101,8 @@ function pt($db, $sql, $date)
|
|||||||
|
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td class="nowrap">'.$date.'</td>';
|
print '<td class="nowrap">'.$date.'</td>';
|
||||||
print '<td align="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
|
print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
|
||||||
print '<td align="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
|
print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$totalclaimed = 0;
|
$totalclaimed = 0;
|
||||||
@ -122,8 +122,8 @@ function pt($db, $sql, $date)
|
|||||||
{
|
{
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td class="nowrap">'.$previousmonth."</td>\n";
|
print '<td class="nowrap">'.$previousmonth."</td>\n";
|
||||||
print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
|
print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
|
||||||
print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
|
print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$amountclaimed = 0;
|
$amountclaimed = 0;
|
||||||
@ -145,8 +145,8 @@ function pt($db, $sql, $date)
|
|||||||
{
|
{
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td class="nowrap">'.$obj->dm."</td>\n";
|
print '<td class="nowrap">'.$obj->dm."</td>\n";
|
||||||
print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
|
print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
|
||||||
print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
|
print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$amountclaimed = 0;
|
$amountclaimed = 0;
|
||||||
$amountpaid = 0;
|
$amountpaid = 0;
|
||||||
@ -166,8 +166,8 @@ function pt($db, $sql, $date)
|
|||||||
{
|
{
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td class="nowrap">'.$previousmonth."</td>\n";
|
print '<td class="nowrap">'.$previousmonth."</td>\n";
|
||||||
print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
|
print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
|
||||||
print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
|
print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$amountclaimed = 0;
|
$amountclaimed = 0;
|
||||||
@ -175,9 +175,9 @@ function pt($db, $sql, $date)
|
|||||||
}
|
}
|
||||||
|
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td align="right">'.$langs->trans("Total").'</td>';
|
print '<td class="right">'.$langs->trans("Total").'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price($totalclaimed).'</td>';
|
print '<td class="nowrap right">'.price($totalclaimed).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price($totalpaid).'</td>';
|
print '<td class="nowrap right">'.price($totalpaid).'</td>';
|
||||||
print "</tr>";
|
print "</tr>";
|
||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
@ -249,16 +249,16 @@ print '<table class="noborder" width="100%">';
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td width="30%">'.$langs->trans("Year")." ".$y."</td>";
|
print '<td width="30%">'.$langs->trans("Year")." ".$y."</td>";
|
||||||
if($CalcLT==0) {
|
if($CalcLT==0) {
|
||||||
print "<td align=\"right\">".$langs->transcountry($LTCustomer, $mysoc->country_code)."</td>";
|
print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td>';
|
||||||
print "<td align=\"right\">".$langs->transcountry($LTSupplier, $mysoc->country_code)."</td>";
|
print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td>';
|
||||||
}
|
}
|
||||||
if($CalcLT==1) {
|
if($CalcLT==1) {
|
||||||
print "<td align=\"right\">".$langs->transcountry($LTSupplier, $mysoc->country_code)."</td><td></td>";
|
print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td><td></td>';
|
||||||
}
|
}
|
||||||
if($CalcLT==2) {
|
if($CalcLT==2) {
|
||||||
print "<td align=\"right\">".$langs->transcountry($LTCustomer, $mysoc->country_code)."</td><td></td>";
|
print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td><td></td>';
|
||||||
}
|
}
|
||||||
print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
|
print '<td class="right">'.$langs->trans("TotalToPay").'</td>';
|
||||||
print "<td> </td>\n";
|
print "<td> </td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -475,7 +475,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
|
|||||||
$x_coll_sum += $temp_vat;
|
$x_coll_sum += $temp_vat;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_coll_sum, 'MT'))."</td>";
|
print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
|
||||||
|
|
||||||
$x_paye_sum = 0;
|
$x_paye_sum = 0;
|
||||||
foreach (array_keys($x_paye) as $rate)
|
foreach (array_keys($x_paye) as $rate)
|
||||||
@ -519,7 +519,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
|
|||||||
$x_paye_sum += $temp_vat;
|
$x_paye_sum += $temp_vat;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_paye_sum, 'MT'))."</td>";
|
print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
|
||||||
|
|
||||||
$subtotalcoll = $subtotalcoll + $x_coll_sum;
|
$subtotalcoll = $subtotalcoll + $x_coll_sum;
|
||||||
$subtotalpaye = $subtotalpaye + $x_paye_sum;
|
$subtotalpaye = $subtotalpaye + $x_paye_sum;
|
||||||
@ -528,7 +528,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
|
|||||||
$total = $total + $diff;
|
$total = $total + $diff;
|
||||||
$subtotal = price2num($subtotal + $diff, 'MT');
|
$subtotal = price2num($subtotal + $diff, 'MT');
|
||||||
|
|
||||||
print "<td class=\"nowrap\" align=\"right\">".price(price2num($diff, 'MT'))."</td>\n";
|
print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>\n';
|
||||||
print "<td> </td>\n";
|
print "<td> </td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -536,16 +536,16 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) // $mc
|
|||||||
if ($i > 2)
|
if ($i > 2)
|
||||||
{
|
{
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td align="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
|
print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
|
||||||
print '<td class="nowrap" align="right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
|
print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
|
print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price(price2num($subtotal, 'MT')).'</td>';
|
print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
|
||||||
print '<td> </td></tr>';
|
print '<td> </td></tr>';
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
|
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap" align="right">'.price(price2num($total, 'MT')).'</td>';
|
print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
|
||||||
print "<td> </td>\n";
|
print "<td> </td>\n";
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
|
|||||||
@ -93,7 +93,7 @@ if ($result)
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
|
print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
|
||||||
print '<td align="right">'.price($total).'</td></tr>';
|
print '<td class="right">'.price($total).'</td></tr>';
|
||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
|
|||||||
@ -320,10 +320,10 @@ else
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td class="left">'.$elementcust.'</td>';
|
print '<td class="left">'.$elementcust.'</td>';
|
||||||
print '<td class="left">'.$productcust.'</td>';
|
print '<td class="left">'.$productcust.'</td>';
|
||||||
if ($modetax != 2) print '<td align="right">'.$amountcust.'</td>';
|
if ($modetax != 2) print '<td class="right">'.$amountcust.'</td>';
|
||||||
if ($modetax != 1) print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
|
if ($modetax != 1) print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
|
||||||
print '<td align="right">'.$langs->trans("BI").'</td>';
|
print '<td class="right">'.$langs->trans("BI").'</td>';
|
||||||
print '<td align="right">'.$vatcust.'</td>';
|
print '<td class="right">'.$vatcust.'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
|
|
||||||
@ -357,7 +357,7 @@ else
|
|||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
|
|
||||||
// Ref
|
// Ref
|
||||||
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
|
print '<td class="nowrap left">'.$fields['link'].'</td>';
|
||||||
|
|
||||||
// Description
|
// Description
|
||||||
print '<td class="left">';
|
print '<td class="left">';
|
||||||
@ -389,7 +389,7 @@ else
|
|||||||
// Total HT
|
// Total HT
|
||||||
if ($modetax != 2)
|
if ($modetax != 2)
|
||||||
{
|
{
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
print price($fields['totalht']);
|
print price($fields['totalht']);
|
||||||
if (price2num($fields['ftotal_ttc']))
|
if (price2num($fields['ftotal_ttc']))
|
||||||
{
|
{
|
||||||
@ -403,7 +403,7 @@ else
|
|||||||
if ($modetax != 1)
|
if ($modetax != 1)
|
||||||
{
|
{
|
||||||
if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
|
if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
|
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
|
||||||
{
|
{
|
||||||
$payment_static->id=$fields['payment_id'];
|
$payment_static->id=$fields['payment_id'];
|
||||||
@ -421,14 +421,14 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Total collected
|
// Total collected
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
$temp_ht=$fields['totalht'];
|
$temp_ht=$fields['totalht'];
|
||||||
if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
|
if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
|
||||||
print price(price2num($temp_ht, 'MT'));
|
print price(price2num($temp_ht, 'MT'));
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
// Localtax
|
// Localtax
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
|
$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
|
||||||
print price(price2num($temp_vat, 'MT'));
|
print price(price2num($temp_vat, 'MT'));
|
||||||
//print price($fields['vat']);
|
//print price($fields['vat']);
|
||||||
@ -445,14 +445,14 @@ else
|
|||||||
// Total customers for this vat rate
|
// Total customers for this vat rate
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
print '<td align="right">'.$langs->trans("Total").':</td>';
|
print '<td class="right">'.$langs->trans("Total").':</td>';
|
||||||
if ($modetax != 1)
|
if ($modetax != 1)
|
||||||
{
|
{
|
||||||
print '<td class="nowrap" align="right"> </td>';
|
print '<td class="nowrap right"> </td>';
|
||||||
print '<td align="right"> </td>';
|
print '<td class="right"> </td>';
|
||||||
}
|
}
|
||||||
print '<td align="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
|
print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
|
print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -460,14 +460,14 @@ else
|
|||||||
{
|
{
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '<td align="right">'.$langs->trans("Total").':</td>';
|
print '<td class="right">'.$langs->trans("Total").':</td>';
|
||||||
if ($modetax == 0)
|
if ($modetax == 0)
|
||||||
{
|
{
|
||||||
print '<td class="nowrap" align="right"> </td>';
|
print '<td class="nowrap right"> </td>';
|
||||||
print '<td align="right"> </td>';
|
print '<td class="right"> </td>';
|
||||||
}
|
}
|
||||||
print '<td align="right">'.price(price2num(0, 'MT')).'</td>';
|
print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price(price2num(0, 'MT')).'</td>';
|
print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -485,11 +485,11 @@ else
|
|||||||
print '<td class="left">'.$productsup.'</td>';
|
print '<td class="left">'.$productsup.'</td>';
|
||||||
if ($modetax != 1)
|
if ($modetax != 1)
|
||||||
{
|
{
|
||||||
print '<td align="right">'.$amountsup.'</td>';
|
print '<td class="right">'.$amountsup.'</td>';
|
||||||
print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
|
print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
|
||||||
}
|
}
|
||||||
print '<td align="right">'.$langs->trans("BI").'</td>';
|
print '<td class="right">'.$langs->trans("BI").'</td>';
|
||||||
print '<td align="right">'.$vatsup.'</td>';
|
print '<td class="right">'.$vatsup.'</td>';
|
||||||
print '</tr>'."\n";
|
print '</tr>'."\n";
|
||||||
|
|
||||||
foreach(array_keys($x_paye) as $rate)
|
foreach(array_keys($x_paye) as $rate)
|
||||||
@ -519,7 +519,7 @@ else
|
|||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
|
|
||||||
// Ref
|
// Ref
|
||||||
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
|
print '<td class="nowrap left">'.$fields['link'].'</td>';
|
||||||
|
|
||||||
// Description
|
// Description
|
||||||
print '<td class="left">';
|
print '<td class="left">';
|
||||||
@ -545,7 +545,7 @@ else
|
|||||||
// Total HT
|
// Total HT
|
||||||
if ($modetax != 2)
|
if ($modetax != 2)
|
||||||
{
|
{
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
print price($fields['totalht']);
|
print price($fields['totalht']);
|
||||||
if (price2num($fields['ftotal_ttc']))
|
if (price2num($fields['ftotal_ttc']))
|
||||||
{
|
{
|
||||||
@ -560,7 +560,7 @@ else
|
|||||||
$ratiopaymentinvoice=1;
|
$ratiopaymentinvoice=1;
|
||||||
if ($modetax != 1)
|
if ($modetax != 1)
|
||||||
{
|
{
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
|
if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
|
||||||
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
|
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
|
||||||
{
|
{
|
||||||
@ -582,13 +582,13 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
// VAT paid
|
// VAT paid
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
|
$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
|
||||||
print price(price2num($temp_ht, 'MT'), 1);
|
print price(price2num($temp_ht, 'MT'), 1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
// Localtax
|
// Localtax
|
||||||
print '<td class="nowrap" align="right">';
|
print '<td class="nowrap right">';
|
||||||
$temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;
|
$temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;
|
||||||
print price(price2num($temp_vat, 'MT'), 1);
|
print price(price2num($temp_vat, 'MT'), 1);
|
||||||
//print price($fields['vat']);
|
//print price($fields['vat']);
|
||||||
@ -605,27 +605,27 @@ else
|
|||||||
// Total suppliers for this vat rate
|
// Total suppliers for this vat rate
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '<td align="right">'.$langs->trans("Total").':</td>';
|
print '<td class="right">'.$langs->trans("Total").':</td>';
|
||||||
if ($modetax != 1)
|
if ($modetax != 1)
|
||||||
{
|
{
|
||||||
print '<td class="nowrap" align="right"> </td>';
|
print '<td class="nowrap right"> </td>';
|
||||||
print '<td align="right"> </td>';
|
print '<td class="right"> </td>';
|
||||||
}
|
}
|
||||||
print '<td align="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
|
print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
|
print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count($x_paye) == 0) { // Show a total line if nothing shown
|
if (count($x_paye) == 0) { // Show a total line if nothing shown
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '<td align="right">'.$langs->trans("Total").':</td>';
|
print '<td class="right">'.$langs->trans("Total").':</td>';
|
||||||
if ($modetax != 1) {
|
if ($modetax != 1) {
|
||||||
print '<td class="nowrap" align="right"> </td>';
|
print '<td class="nowrap right"> </td>';
|
||||||
print '<td align="right"> </td>';
|
print '<td class="right"> </td>';
|
||||||
}
|
}
|
||||||
print '<td align="right">'.price(price2num(0, 'MT')).'</td>';
|
print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
|
||||||
print '<td class="nowrap" align="right">'.price(price2num(0, 'MT')).'</td>';
|
print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -638,7 +638,7 @@ else
|
|||||||
$diff = $x_coll_sum - $x_paye_sum;
|
$diff = $x_coll_sum - $x_paye_sum;
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
|
print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
|
||||||
print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
|
print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
* Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
* Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||||
* Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
|
* Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
|
||||||
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
|
||||||
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -763,7 +763,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
|
|||||||
{
|
{
|
||||||
// Print total
|
// Print total
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
|
print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').'</td>';
|
||||||
if (!empty($conf->multicurrency->enabled)) {
|
if (!empty($conf->multicurrency->enabled)) {
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
|
|||||||
@ -343,10 +343,10 @@ if ($resql)
|
|||||||
print '<td>'.$langs->trans('Bill').'</td>';
|
print '<td>'.$langs->trans('Bill').'</td>';
|
||||||
print '<td>'.$langs->trans('Company').'</td>';
|
print '<td>'.$langs->trans('Company').'</td>';
|
||||||
if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED )print '<td>'.$langs->trans('Entity').'</td>';
|
if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED )print '<td>'.$langs->trans('Entity').'</td>';
|
||||||
print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
|
print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
|
||||||
print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
|
print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
|
||||||
print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
|
print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
|
||||||
print '<td align="right">'.$langs->trans('Status').'</td>';
|
print '<td class="right">'.$langs->trans('Status').'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
if ($num > 0)
|
if ($num > 0)
|
||||||
@ -386,16 +386,16 @@ if ($resql)
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
// Expected to pay
|
// Expected to pay
|
||||||
print '<td align="right">'.price($objp->total_ttc).'</td>';
|
print '<td class="right">'.price($objp->total_ttc).'</td>';
|
||||||
|
|
||||||
// Amount payed
|
// Amount payed
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td class="right">'.price($objp->amount).'</td>';
|
||||||
|
|
||||||
// Remain to pay
|
// Remain to pay
|
||||||
print '<td align="right">'.price($remaintopay).'</td>';
|
print '<td class="right">'.price($remaintopay).'</td>';
|
||||||
|
|
||||||
// Status
|
// Status
|
||||||
print '<td align="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
|
print '<td class="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
|
||||||
|
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
if ($objp->paye == 1) // If at least one invoice is paid, disable delete
|
if ($objp->paye == 1) // If at least one invoice is paid, disable delete
|
||||||
|
|||||||
@ -476,7 +476,7 @@ if ($action == 'new')
|
|||||||
print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
|
print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
|
||||||
print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
|
print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
|
||||||
print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
|
print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
|
||||||
print '<td align="right" width="100px">'.$langs->trans("Amount")."</td>\n";
|
print '<td class="right" width="100px">'.$langs->trans("Amount")."</td>\n";
|
||||||
print '<td align="center" width="100px">'.$langs->trans("Payment")."</td>\n";
|
print '<td align="center" width="100px">'.$langs->trans("Payment")."</td>\n";
|
||||||
print '<td align="center" width="100px">'.$langs->trans("LineRecord")."</td>\n";
|
print '<td align="center" width="100px">'.$langs->trans("LineRecord")."</td>\n";
|
||||||
print '<td align="center" width="100px">'.$langs->trans("Select")."<br>";
|
print '<td align="center" width="100px">'.$langs->trans("Select")."<br>";
|
||||||
@ -500,7 +500,7 @@ if ($action == 'new')
|
|||||||
print '<td>'.$value["numero"]."</td>\n";
|
print '<td>'.$value["numero"]."</td>\n";
|
||||||
print '<td>'.$value["emetteur"]."</td>\n";
|
print '<td>'.$value["emetteur"]."</td>\n";
|
||||||
print '<td>'.$value["banque"]."</td>\n";
|
print '<td>'.$value["banque"]."</td>\n";
|
||||||
print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
|
print '<td class="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
|
||||||
|
|
||||||
// Link to payment
|
// Link to payment
|
||||||
print '<td align="center">';
|
print '<td align="center">';
|
||||||
@ -576,7 +576,7 @@ else
|
|||||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||||
print $langs->trans('Date');
|
print $langs->trans('Date');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($action != 'editdate') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
|
if ($action != 'editdate') print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td colspan="2">';
|
print '</td><td colspan="2">';
|
||||||
if ($action == 'editdate')
|
if ($action == 'editdate')
|
||||||
@ -603,7 +603,7 @@ else
|
|||||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||||
print $langs->trans('RefExt');
|
print $langs->trans('RefExt');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($action != 'editrefext') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrefext&id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
|
if ($action != 'editrefext') print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrefext&id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
print '</td><td colspan="2">';
|
print '</td><td colspan="2">';
|
||||||
if ($action == 'editrefext')
|
if ($action == 'editrefext')
|
||||||
@ -674,7 +674,7 @@ else
|
|||||||
print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "b.num_chq", "", $param, 'align="center"', $sortfield, $sortorder);
|
print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "b.num_chq", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("CheckTransmitter", $_SERVER["PHP_SELF"], "b.emetteur", "", $param, "", $sortfield, $sortorder);
|
print_liste_field_titre("CheckTransmitter", $_SERVER["PHP_SELF"], "b.emetteur", "", $param, "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Bank", $_SERVER["PHP_SELF"], "b.banque", "", $param, "", $sortfield, $sortorder);
|
print_liste_field_titre("Bank", $_SERVER["PHP_SELF"], "b.banque", "", $param, "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Payment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
|
print_liste_field_titre("Payment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("LineRecord", $_SERVER["PHP_SELF"], "b.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
|
print_liste_field_titre("LineRecord", $_SERVER["PHP_SELF"], "b.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
@ -698,7 +698,7 @@ else
|
|||||||
print '<td align="center">'.($objp->num_chq?$objp->num_chq:' ').'</td>';
|
print '<td align="center">'.($objp->num_chq?$objp->num_chq:' ').'</td>';
|
||||||
print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
|
print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
|
||||||
print '<td>'.dol_trunc($objp->banque, 24).'</td>';
|
print '<td>'.dol_trunc($objp->banque, 24).'</td>';
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td class="right">'.price($objp->amount).'</td>';
|
||||||
// Link to payment
|
// Link to payment
|
||||||
print '<td align="center">';
|
print '<td align="center">';
|
||||||
$paymentstatic->id=$objp->pid;
|
$paymentstatic->id=$objp->pid;
|
||||||
@ -725,7 +725,7 @@ else
|
|||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
// Action button
|
// Action button
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
if ($object->statut == 0)
|
if ($object->statut == 0)
|
||||||
{
|
{
|
||||||
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&lineid='.$objp->rowid.'">'.img_delete().'</a>';
|
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&lineid='.$objp->rowid.'">'.img_delete().'</a>';
|
||||||
|
|||||||
@ -72,7 +72,7 @@ if ($resql) {
|
|||||||
}
|
}
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
|
print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
|
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
@ -106,9 +106,9 @@ if ($resql)
|
|||||||
print '<th>'.$langs->trans("LastCheckReceiptShort", $max).'</th>';
|
print '<th>'.$langs->trans("LastCheckReceiptShort", $max).'</th>';
|
||||||
print '<th>'.$langs->trans("Date")."</th>";
|
print '<th>'.$langs->trans("Date")."</th>";
|
||||||
print '<th>'.$langs->trans("Account").'</th>';
|
print '<th>'.$langs->trans("Account").'</th>';
|
||||||
print '<th align="right">'.$langs->trans("NbOfCheques").'</th>';
|
print '<th class="right">'.$langs->trans("NbOfCheques").'</th>';
|
||||||
print '<th align="right">'.$langs->trans("Amount").'</th>';
|
print '<th class="right">'.$langs->trans("Amount").'</th>';
|
||||||
print '<th align="right">'.$langs->trans("Status").'</th>';
|
print '<th class="right">'.$langs->trans("Status").'</th>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
while ( $objp = $db->fetch_object($resql) )
|
while ( $objp = $db->fetch_object($resql) )
|
||||||
@ -131,9 +131,9 @@ if ($resql)
|
|||||||
print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
|
print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
|
||||||
print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';
|
print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';
|
||||||
print '<td>'.$accountstatic->getNomUrl(1).'</td>';
|
print '<td>'.$accountstatic->getNomUrl(1).'</td>';
|
||||||
print '<td align="right">'.$objp->nbcheque.'</td>';
|
print '<td class="right">'.$objp->nbcheque.'</td>';
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td class="right">'.price($objp->amount).'</td>';
|
||||||
print '<td align="right">'.$checkdepositstatic->LibStatut($objp->statut, 3).'</td>';
|
print '<td class="right">'.$checkdepositstatic->LibStatut($objp->statut, 3).'</td>';
|
||||||
|
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -173,11 +173,11 @@ if ($resql)
|
|||||||
$form->select_comptes($search_account, 'search_account', 0, '', 1);
|
$form->select_comptes($search_account, 'search_account', 0, '', 1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre"> </td>';
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat maxwidth50" type="text" name="search_amount" value="'.$search_amount.'">';
|
print '<input class="flat maxwidth50" type="text" name="search_amount" value="'.$search_amount.'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="liste_titre"></td>';
|
print '<td class="liste_titre"></td>';
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
$searchpicto=$form->showFilterAndCheckAddButtons(0);
|
$searchpicto=$form->showFilterAndCheckAddButtons(0);
|
||||||
print $searchpicto;
|
print $searchpicto;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
@ -187,9 +187,9 @@ if ($resql)
|
|||||||
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder);
|
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder);
|
print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
|
print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -219,13 +219,13 @@ if ($resql)
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
// Number of cheques
|
// Number of cheques
|
||||||
print '<td align="right">'.$objp->nbcheque.'</td>';
|
print '<td class="right">'.$objp->nbcheque.'</td>';
|
||||||
|
|
||||||
// Amount
|
// Amount
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td class="right">'.price($objp->amount).'</td>';
|
||||||
|
|
||||||
// Statut
|
// Statut
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print $checkdepositstatic->LibStatut($objp->statut, 5);
|
print $checkdepositstatic->LibStatut($objp->statut, 5);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
|
|||||||
@ -225,7 +225,7 @@ if ($resql)
|
|||||||
|
|
||||||
// Lines for filters fields
|
// Lines for filters fields
|
||||||
print '<tr class="liste_titre_filter">';
|
print '<tr class="liste_titre_filter">';
|
||||||
print '<td class="liste_titre" align="left">';
|
print '<td class="liste_titre left">';
|
||||||
print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="liste_titre" align="center">';
|
print '<td class="liste_titre" align="center">';
|
||||||
@ -248,16 +248,16 @@ if ($resql)
|
|||||||
$form->select_comptes($search_account, 'search_account', 0, '', 1);
|
$form->select_comptes($search_account, 'search_account', 0, '', 1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
|
print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
$searchpicto=$form->showFilterAndCheckAddButtons(0);
|
$searchpicto=$form->showFilterAndCheckAddButtons(0);
|
||||||
print $searchpicto;
|
print $searchpicto;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
|
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
|
||||||
{
|
{
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
@ -272,8 +272,8 @@ if ($resql)
|
|||||||
{
|
{
|
||||||
print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
|
print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
|
||||||
}
|
}
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
//print_liste_field_titre("Invoices"),"","","",$param,'align="left"',$sortfield,$sortorder);
|
//print_liste_field_titre("Invoices"),"","","",$param,'class="left"',$sortfield,$sortorder);
|
||||||
|
|
||||||
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
|
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
|
||||||
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
|
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
|
||||||
@ -342,11 +342,11 @@ if ($resql)
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
// Amount
|
// Amount
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td class="right">'.price($objp->amount).'</td>';
|
||||||
|
|
||||||
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
|
if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
|
||||||
{
|
{
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&action=valide">';
|
if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&action=valide">';
|
||||||
print $paymentstatic->LibStatut($objp->statut, 5);
|
print $paymentstatic->LibStatut($objp->statut, 5);
|
||||||
if ($objp->statut == 0) print '</a>';
|
if ($objp->statut == 0) print '</a>';
|
||||||
|
|||||||
@ -142,8 +142,8 @@ if ($year)
|
|||||||
print '<table width="100%" class="noborder">';
|
print '<table width="100%" class="noborder">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td>'.$langs->trans("Reporting").'</td>';
|
print '<td>'.$langs->trans("Reporting").'</td>';
|
||||||
print '<td align="right">'.$langs->trans("Size").'</td>';
|
print '<td class="right">'.$langs->trans("Size").'</td>';
|
||||||
print '<td align="right">'.$langs->trans("Date").'</td>';
|
print '<td class="right">'.$langs->trans("Date").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
if (is_resource($handle))
|
if (is_resource($handle))
|
||||||
@ -156,8 +156,8 @@ if ($year)
|
|||||||
$tfile = $dir . '/'.$year.'/'.$file;
|
$tfile = $dir . '/'.$year.'/'.$file;
|
||||||
$relativepath = $year.'/'.$file;
|
$relativepath = $year.'/'.$file;
|
||||||
print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
|
print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
|
||||||
print '<td align="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
|
print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
|
||||||
print '<td align="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
|
print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
closedir($handle);
|
closedir($handle);
|
||||||
|
|||||||
@ -108,7 +108,7 @@ if ($resql)
|
|||||||
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder);
|
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder);
|
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder);
|
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder);
|
||||||
print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ if ($resql)
|
|||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.'</a></td>';
|
||||||
print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
|
print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
|
||||||
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
|
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td class="right">'.price($objp->amount).'</td>';
|
||||||
print '<td align="center">';
|
print '<td align="center">';
|
||||||
|
|
||||||
if ($objp->statut == 0)
|
if ($objp->statut == 0)
|
||||||
|
|||||||
@ -240,9 +240,9 @@ if ($resql)
|
|||||||
print '<td>'.$langs->trans('SocialContribution').'</td>';
|
print '<td>'.$langs->trans('SocialContribution').'</td>';
|
||||||
print '<td>'.$langs->trans('Type').'</td>';
|
print '<td>'.$langs->trans('Type').'</td>';
|
||||||
print '<td>'.$langs->trans('Label').'</td>';
|
print '<td>'.$langs->trans('Label').'</td>';
|
||||||
print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
|
print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
|
||||||
print '<td align="center">'.$langs->trans('Status').'</td>';
|
print '<td align="center">'.$langs->trans('Status').'</td>';
|
||||||
print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
|
print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
if ($num > 0)
|
if ($num > 0)
|
||||||
@ -265,11 +265,11 @@ if ($resql)
|
|||||||
// Label
|
// Label
|
||||||
print '<td>'.$objp->libelle.'</td>';
|
print '<td>'.$objp->libelle.'</td>';
|
||||||
// Expected to pay
|
// Expected to pay
|
||||||
print '<td align="right">'.price($objp->sc_amount).'</td>';
|
print '<td class="right">'.price($objp->sc_amount).'</td>';
|
||||||
// Status
|
// Status
|
||||||
print '<td align="center">'.$socialcontrib->getLibStatut(4, $objp->amount).'</td>';
|
print '<td align="center">'.$socialcontrib->getLibStatut(4, $objp->amount).'</td>';
|
||||||
// Amount payed
|
// Amount payed
|
||||||
print '<td align="right">'.price($objp->amount).'</td>';
|
print '<td class="right">'.price($objp->amount).'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
if ($objp->paye == 1) // If at least one invoice is paid, disable delete
|
if ($objp->paye == 1) // If at least one invoice is paid, disable delete
|
||||||
{
|
{
|
||||||
|
|||||||
@ -136,7 +136,7 @@ if ($result)
|
|||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre"> </td>';
|
||||||
print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'. dol_escape_htmltag($search_amount).'"></td>';
|
print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'. dol_escape_htmltag($search_amount).'"></td>';
|
||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre"> </td>';
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
$searchpicto=$form->showFilterButtons();
|
$searchpicto=$form->showFilterButtons();
|
||||||
print $searchpicto;
|
print $searchpicto;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
@ -145,8 +145,8 @@ if ($result)
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre("WithdrawalsReceipts", $_SERVER["PHP_SELF"], "p.ref", '', '', 'class="liste_titre"', $sortfield, $sortorder);
|
print_liste_field_titre("WithdrawalsReceipts", $_SERVER["PHP_SELF"], "p.ref", '', '', 'class="liste_titre"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'class="liste_titre" align="center"', $sortfield, $sortorder);
|
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'class="liste_titre" align="center"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", "", 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", "", 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'class="right"', $sortfield, $sortorder);
|
||||||
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
|
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -160,13 +160,13 @@ if ($result)
|
|||||||
|
|
||||||
print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
|
print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->amount)."</td>\n";
|
print '<td class="right">'.price($obj->amount)."</td>\n";
|
||||||
|
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print $bon->LibStatut($obj->statut, 3);
|
print $bon->LibStatut($obj->statut, 3);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
print '<td align="right"></td>'."\n";
|
print '<td class="right"></td>'."\n";
|
||||||
|
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
@ -344,7 +344,7 @@ if ($id > 0 || $ref)
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre("Lines", $_SERVER["PHP_SELF"], "pl.rowid", '', $urladd);
|
print_liste_field_titre("Lines", $_SERVER["PHP_SELF"], "pl.rowid", '', $urladd);
|
||||||
print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $urladd);
|
print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $urladd);
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $urladd, 'align="right"');
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $urladd, 'class="right"');
|
||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -372,7 +372,7 @@ if ($id > 0 || $ref)
|
|||||||
print $thirdparty->getNomUrl(1);
|
print $thirdparty->getNomUrl(1);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->amount)."</td>\n";
|
print '<td class="right">'.price($obj->amount)."</td>\n";
|
||||||
|
|
||||||
print '<td>';
|
print '<td>';
|
||||||
|
|
||||||
@ -397,7 +397,7 @@ if ($id > 0 || $ref)
|
|||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td>'.$langs->trans("Total").'</td>';
|
print '<td>'.$langs->trans("Total").'</td>';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
|
if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
|
||||||
print price($total);
|
print price($total);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|||||||
@ -234,8 +234,8 @@ if ($resql)
|
|||||||
print '<td>'.$langs->trans("ThirdParty").'</td>';
|
print '<td>'.$langs->trans("ThirdParty").'</td>';
|
||||||
print '<td>'.$langs->trans("RIB").'</td>';
|
print '<td>'.$langs->trans("RIB").'</td>';
|
||||||
print '<td>'.$langs->trans("RUM").'</td>';
|
print '<td>'.$langs->trans("RUM").'</td>';
|
||||||
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
|
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
|
||||||
print '<td align="right">'.$langs->trans("DateRequest").'</td>';
|
print '<td class="right">'.$langs->trans("DateRequest").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
if ($num)
|
if ($num)
|
||||||
@ -271,11 +271,11 @@ if ($resql)
|
|||||||
if ($format) print ' ('.$format.')';
|
if ($format) print ' ('.$format.')';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
// Amount
|
// Amount
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print price($obj->amount, 0, $langs, 0, 0, -1, $conf->currency);
|
print price($obj->amount, 0, $langs, 0, 0, -1, $conf->currency);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
// Date
|
// Date
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print dol_print_date($db->jdate($obj->date_demande), 'day');
|
print dol_print_date($db->jdate($obj->date_demande), 'day');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
@ -317,7 +317,7 @@ if ($result)
|
|||||||
print"\n<!-- debut table -->\n";
|
print"\n<!-- debut table -->\n";
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td>';
|
print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td>';
|
||||||
print '<td align="center">'.$langs->trans("Date").'</td><td align="right">'.$langs->trans("Amount").'</td>';
|
print '<td align="center">'.$langs->trans("Date").'</td><td class="right">'.$langs->trans("Amount").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
while ($i < min($num,$limit))
|
while ($i < min($num,$limit))
|
||||||
@ -335,7 +335,7 @@ if ($result)
|
|||||||
|
|
||||||
print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
|
print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";
|
print '<td class="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";
|
||||||
|
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
@ -110,8 +110,8 @@ if ($resql)
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]);
|
print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]);
|
||||||
print_liste_field_titre("Company", $_SERVER["PHP_SELF"]);
|
print_liste_field_titre("Company", $_SERVER["PHP_SELF"]);
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"');
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'class="right"');
|
||||||
print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"');
|
print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'class="center"');
|
||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
@ -121,7 +121,7 @@ if ($resql)
|
|||||||
print '<td class="liste_titre"></td>';
|
print '<td class="liste_titre"></td>';
|
||||||
print '<td class="liste_titre"></td>';
|
print '<td class="liste_titre"></td>';
|
||||||
// Action column
|
// Action column
|
||||||
print '<td class="liste_titre" align="middle">';
|
print '<td class="liste_titre" class="middle">';
|
||||||
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
|
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
|
||||||
print $searchpicto;
|
print $searchpicto;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
@ -148,11 +148,11 @@ if ($resql)
|
|||||||
print $thirdpartystatic->getNomUrl(1, 'customer');
|
print $thirdpartystatic->getNomUrl(1, 'customer');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->total_ttc).'</td>';
|
print '<td class="right">'.price($obj->total_ttc).'</td>';
|
||||||
|
|
||||||
print '<td align="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
|
print '<td class="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
|
||||||
|
|
||||||
print '<td align="right"></td>';
|
print '<td class="right"></td>';
|
||||||
|
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
@ -205,8 +205,8 @@ if ($result)
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
|
print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre("StatusDebitCredit", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
|
print_liste_field_titre("StatusDebitCredit", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
|
||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
@ -235,10 +235,10 @@ if ($result)
|
|||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|
||||||
// Amount of invoice
|
// Amount of invoice
|
||||||
print '<td align="right">'.price($obj->total_ttc)."</td>\n";
|
print '<td class="right">'.price($obj->total_ttc)."</td>\n";
|
||||||
|
|
||||||
// Amount requested
|
// Amount requested
|
||||||
print '<td align="right">'.price($obj->amount_requested)."</td>\n";
|
print '<td class="right">'.price($obj->amount_requested)."</td>\n";
|
||||||
|
|
||||||
// Status of requests
|
// Status of requests
|
||||||
print '<td align="center">';
|
print '<td align="center">';
|
||||||
@ -273,11 +273,11 @@ if ($result)
|
|||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td>'.$langs->trans("Total").'</td>';
|
print '<td>'.$langs->trans("Total").'</td>';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
//if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices"); // It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.
|
//if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices"); // It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.
|
||||||
if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
|
if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print price($totalamount_requested);
|
print price($totalamount_requested);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
|
|||||||
@ -189,8 +189,8 @@ if ($resql)
|
|||||||
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
||||||
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
|
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
|
print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td>';
|
||||||
print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td align="center">'.$langs->trans("Invoice").'</td></tr>';
|
print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td class="center">'.$langs->trans("Invoice").'</td></tr>';
|
||||||
|
|
||||||
$total = 0;
|
$total = 0;
|
||||||
|
|
||||||
@ -209,7 +209,7 @@ if ($resql)
|
|||||||
print '</a></td>';
|
print '</a></td>';
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->amount)."</td>\n";
|
print '<td class="right">'.price($obj->amount)."</td>\n";
|
||||||
print '<td>'.$rej->motifs[$obj->motif].'</td>';
|
print '<td>'.$rej->motifs[$obj->motif].'</td>';
|
||||||
|
|
||||||
print '<td align="center">'.yn($obj->afacturer).'</td>';
|
print '<td align="center">'.yn($obj->afacturer).'</td>';
|
||||||
@ -230,7 +230,7 @@ if ($resql)
|
|||||||
{
|
{
|
||||||
print '<tr class="liste_total"><td> </td>';
|
print '<tr class="liste_total"><td> </td>';
|
||||||
print '<td class="liste_total">'.$langs->trans("Total").'</td>';
|
print '<td class="liste_total">'.$langs->trans("Total").'</td>';
|
||||||
print '<td align="right">'.price($total)."</td>\n";
|
print '<td class="right">'.price($total)."</td>\n";
|
||||||
print '<td colspan="3"> </td>';
|
print '<td colspan="3"> </td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -160,7 +160,7 @@ if ($prev_id > 0 || $ref)
|
|||||||
print"\n<!-- debut table -->\n";
|
print"\n<!-- debut table -->\n";
|
||||||
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
|
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td>'.$langs->trans("Status").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
|
print '<td>'.$langs->trans("Status").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
|
||||||
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
@ -170,10 +170,10 @@ if ($prev_id > 0 || $ref)
|
|||||||
|
|
||||||
print $ligne->LibStatut($row[1], 1);
|
print $ligne->LibStatut($row[1], 1);
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
print price($row[0]);
|
print price($row[0]);
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
if ($object->amount) print round($row[0]/$object->amount*100, 2)." %";
|
if ($object->amount) print round($row[0]/$object->amount*100, 2)." %";
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
|
|||||||
@ -75,14 +75,14 @@ print '<table class="noborder" width="100%">';
|
|||||||
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
|
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
|
||||||
|
|
||||||
print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
|
print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
|
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
|
||||||
print $bprev->NbFactureAPrelever();
|
print $bprev->NbFactureAPrelever();
|
||||||
print '</a>';
|
print '</a>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
|
print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto');
|
print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto');
|
||||||
print '</td></tr></table><br>';
|
print '</td></tr></table><br>';
|
||||||
|
|
||||||
@ -137,15 +137,15 @@ if ($resql)
|
|||||||
print $thirdpartystatic->getNomUrl(1, 'customer');
|
print $thirdpartystatic->getNomUrl(1, 'customer');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print price($obj->amount);
|
print price($obj->amount);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print dol_print_date($db->jdate($obj->date_demande), 'day');
|
print dol_print_date($db->jdate($obj->date_demande), 'day');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
print $invoicestatic->getLibStatut(3, $alreadypayed);
|
print $invoicestatic->getLibStatut(3, $alreadypayed);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
@ -186,8 +186,8 @@ if ($result)
|
|||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><th>'.$langs->trans("LastWithdrawalReceipt", $limit).'</th>';
|
print '<tr class="liste_titre"><th>'.$langs->trans("LastWithdrawalReceipt", $limit).'</th>';
|
||||||
print '<th>'.$langs->trans("Date").'</th>';
|
print '<th>'.$langs->trans("Date").'</th>';
|
||||||
print '<th align="right">'.$langs->trans("Amount").'</th>';
|
print '<th class="right">'.$langs->trans("Amount").'</th>';
|
||||||
print '<th align="right">'.$langs->trans("Status").'</th>';
|
print '<th class="right">'.$langs->trans("Status").'</th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
while ($i < min($num, $limit))
|
while ($i < min($num, $limit))
|
||||||
@ -204,8 +204,8 @@ if ($result)
|
|||||||
print $bprev->getNomUrl(1);
|
print $bprev->getNomUrl(1);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
|
print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
|
||||||
print '<td align="right">'.price($obj->amount)."</td>\n";
|
print '<td class="right">'.price($obj->amount)."</td>\n";
|
||||||
print '<td align="right">'.$bprev->getLibStatut(3)."</td>\n";
|
print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
|
||||||
|
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
@ -292,7 +292,7 @@ if ($id)
|
|||||||
print"\n<!-- debut table -->\n";
|
print"\n<!-- debut table -->\n";
|
||||||
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
|
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">'.$langs->trans("Status").'</td>';
|
print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">'.$langs->trans("Status").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$total = 0;
|
$total = 0;
|
||||||
@ -312,9 +312,9 @@ if ($id)
|
|||||||
print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
|
||||||
print img_object($langs->trans("ShowCompany"), "company"). ' '.$obj->name."</a></td>\n";
|
print img_object($langs->trans("ShowCompany"), "company"). ' '.$obj->name."</a></td>\n";
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->total_ttc)."</td>\n";
|
print '<td class="right">'.price($obj->total_ttc)."</td>\n";
|
||||||
|
|
||||||
print '<td align="right">';
|
print '<td class="right">';
|
||||||
$invoicestatic->fetch($obj->facid);
|
$invoicestatic->fetch($obj->facid);
|
||||||
print $invoicestatic->getLibStatut(5);
|
print $invoicestatic->getLibStatut(5);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
|
|||||||
@ -146,7 +146,7 @@ if ($result)
|
|||||||
print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="6"></td>';
|
print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="6"></td>';
|
||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre"> </td>';
|
||||||
print '<td class="liste_titre"> </td>';
|
print '<td class="liste_titre"> </td>';
|
||||||
print '<td class="liste_titre" align="right">';
|
print '<td class="liste_titre right">';
|
||||||
$searchpicto=$form->showFilterButtons();
|
$searchpicto=$form->showFilterButtons();
|
||||||
print $searchpicto;
|
print $searchpicto;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
@ -159,7 +159,7 @@ if ($result)
|
|||||||
print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom");
|
print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom");
|
||||||
print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', '', 'align="center"');
|
print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', '', 'align="center"');
|
||||||
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'align="center"');
|
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'align="center"');
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'align="right"');
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'class="right"');
|
||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -194,7 +194,7 @@ if ($result)
|
|||||||
|
|
||||||
print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
|
print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->amount)."</td>\n";
|
print '<td class="right">'.price($obj->amount)."</td>\n";
|
||||||
|
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
|
|
||||||
|
|||||||
@ -91,8 +91,8 @@ if ($resql)
|
|||||||
print"\n<!-- debut table -->\n";
|
print"\n<!-- debut table -->\n";
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
|
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td class="right">%</td>';
|
||||||
print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
|
print '<td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
|
||||||
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
@ -105,24 +105,24 @@ if ($resql)
|
|||||||
print '</td><td align="center">';
|
print '</td><td align="center">';
|
||||||
print $row[1];
|
print $row[1];
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
print round($row[1]/$nbtotal*100, 2)." %";
|
print round($row[1]/$nbtotal*100, 2)." %";
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
|
|
||||||
print price($row[0]);
|
print price($row[0]);
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
print round($row[0]/$total*100, 2)." %";
|
print round($row[0]/$total*100, 2)." %";
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td>';
|
print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td>';
|
||||||
print '<td align="center">'.$nbtotal.'</td><td> </td><td align="right">';
|
print '<td align="center">'.$nbtotal.'</td><td> </td><td class="right">';
|
||||||
print price($total);
|
print price($total);
|
||||||
print '</td><td align="right"> </td>';
|
print '</td><td class="right"> </td>';
|
||||||
print "</tr></table>";
|
print "</tr></table>";
|
||||||
$db->free();
|
$db->free();
|
||||||
}
|
}
|
||||||
@ -185,7 +185,7 @@ if ($resql)
|
|||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
|
print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
|
||||||
print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
|
print '<td class="right">%</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
|
||||||
$Rejet = new RejetPrelevement($db, $user);
|
$Rejet = new RejetPrelevement($db, $user);
|
||||||
@ -199,13 +199,13 @@ if ($resql)
|
|||||||
|
|
||||||
print '</td><td align="center">'.$row[1];
|
print '</td><td align="center">'.$row[1];
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
print round($row[1]/$nbtotal*100, 2)." %";
|
print round($row[1]/$nbtotal*100, 2)." %";
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
print price($row[0]);
|
print price($row[0]);
|
||||||
|
|
||||||
print '</td><td align="right">';
|
print '</td><td class="right">';
|
||||||
print round($row[0]/$total*100, 2)." %";
|
print round($row[0]/$total*100, 2)." %";
|
||||||
|
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
@ -213,10 +213,10 @@ if ($resql)
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>';
|
print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>';
|
||||||
print '<td> </td><td align="right">';
|
print '<td> </td><td class="right">';
|
||||||
print price($total);
|
print price($total);
|
||||||
print '</td><td align="right"> </td>';
|
print '</td><td class="right"> </td>';
|
||||||
print "</tr></table>";
|
print "</tr></table>";
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -222,15 +222,15 @@ print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_
|
|||||||
print_liste_field_titre('');
|
print_liste_field_titre('');
|
||||||
if ($modecompta == 'BOOKKEEPING')
|
if ($modecompta == 'BOOKKEEPING')
|
||||||
{
|
{
|
||||||
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
{
|
{
|
||||||
print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
}
|
}
|
||||||
print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
|
print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
|
||||||
}
|
}
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -284,7 +284,7 @@ if ($modecompta == 'BOOKKEEPING')
|
|||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '<td>'.$objp->pcg_type.($objp->pcg_subtype != 'XXXXXX'?' - '.$objp->pcg_subtype:'').($objp->name?' ('.$objp->name.')':'')."</td>\n";
|
print '<td>'.$objp->pcg_type.($objp->pcg_subtype != 'XXXXXX'?' - '.$objp->pcg_subtype:'').($objp->name?' ('.$objp->name.')':'')."</td>\n";
|
||||||
print '<td align="right">'.price($objp->amount)."</td>\n";
|
print '<td class="right">'.price($objp->amount)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$total_ht += (isset($objp->amount)?$objp->amount:0);
|
$total_ht += (isset($objp->amount)?$objp->amount:0);
|
||||||
@ -317,7 +317,7 @@ if ($modecompta == 'BOOKKEEPING')
|
|||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
print '<td class="tdoverflowmax200"> ' . length_accountg($cpt['account_number']) . ' - ' . $cpt['account_label'] . '</td>';
|
print '<td class="tdoverflowmax200"> ' . length_accountg($cpt['account_number']) . ' - ' . $cpt['account_label'] . '</td>';
|
||||||
print '<td align="right">' . price($resultN) . '</td>';
|
print '<td class="right">' . price($resultN) . '</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -389,8 +389,8 @@ else
|
|||||||
print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
|
print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
|
||||||
|
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print "<td align=\"right\">".price($objp->amount_ht)."</td>\n";
|
print '<td class="right">'.price($objp->amount_ht)."</td>\n";
|
||||||
print "<td align=\"right\">".price($objp->amount_ttc)."</td>\n";
|
print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
|
||||||
|
|
||||||
$total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
|
$total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
|
||||||
$total_ttc += $objp->amount_ttc;
|
$total_ttc += $objp->amount_ttc;
|
||||||
@ -434,8 +434,8 @@ else
|
|||||||
print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
|
print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
|
||||||
|
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print "<td align=\"right\">".price($objp->amount_ht)."</td>\n";
|
print '<td class="right">'.price($objp->amount_ht)."</td>\n";
|
||||||
print "<td align=\"right\">".price($objp->amount_ttc)."</td>\n";
|
print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
|
||||||
|
|
||||||
$total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
|
$total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
|
||||||
$total_ttc += $objp->amount_ttc;
|
$total_ttc += $objp->amount_ttc;
|
||||||
@ -459,8 +459,8 @@ else
|
|||||||
|
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td colspan="3" align="right">'.price($total_ht).'</td>';
|
print '<td colspan="3" class="right">'.price($total_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price($total_ttc).'</td>';
|
print '<td colspan="3" class="right">'.price($total_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
|
|
||||||
@ -519,8 +519,8 @@ else
|
|||||||
print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
|
print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
|
||||||
|
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print "<td align=\"right\">".price(-$objp->amount_ht)."</td>\n";
|
print '<td class="right">'.price(-$objp->amount_ht)."</td>\n";
|
||||||
print "<td align=\"right\">".price(-$objp->amount_ttc)."</td>\n";
|
print '<td class="right">'.price(-$objp->amount_ttc)."</td>\n";
|
||||||
|
|
||||||
$total_ht -= (isset($objp->amount_ht)?$objp->amount_ht:0);
|
$total_ht -= (isset($objp->amount_ht)?$objp->amount_ht:0);
|
||||||
$total_ttc -= $objp->amount_ttc;
|
$total_ttc -= $objp->amount_ttc;
|
||||||
@ -544,8 +544,8 @@ else
|
|||||||
}
|
}
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
|
|
||||||
@ -605,8 +605,8 @@ else
|
|||||||
|
|
||||||
print '<tr class="oddeven"><td> </td>';
|
print '<tr class="oddeven"><td> </td>';
|
||||||
print '<td>'.$obj->label.'</td>';
|
print '<td>'.$obj->label.'</td>';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
|
||||||
print '<td align="right">'.price(-$obj->amount).'</td>';
|
print '<td class="right">'.price(-$obj->amount).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
@ -621,8 +621,8 @@ else
|
|||||||
}
|
}
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
|
|
||||||
@ -682,8 +682,8 @@ else
|
|||||||
print '<tr class="oddeven"><td> </td>';
|
print '<tr class="oddeven"><td> </td>';
|
||||||
print '<td>'.$obj->label.'</td>';
|
print '<td>'.$obj->label.'</td>';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td align="right">'.price(-$obj->amount).'</td>';
|
print '<td class="right">'.price(-$obj->amount).'</td>';
|
||||||
print '<td align="right">'.price(-$obj->amount).'</td>';
|
print '<td class="right">'.price(-$obj->amount).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
@ -698,8 +698,8 @@ else
|
|||||||
}
|
}
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
if ($mysoc->tva_assuj == 'franchise') // Non assujetti
|
if ($mysoc->tva_assuj == 'franchise') // Non assujetti
|
||||||
@ -709,10 +709,10 @@ else
|
|||||||
print '<td colspan="4"> </td>';
|
print '<td colspan="4"> </td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
|
print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td class="border" align="right">'.price($total_ht).'</td>';
|
print '<td class="border right">'.price($total_ht).'</td>';
|
||||||
print '<td align="right">'.price($total_ttc).'</td>';
|
print '<td class="right">'.price($total_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
@ -775,8 +775,8 @@ else
|
|||||||
|
|
||||||
print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/compta/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
|
print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/compta/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
|
||||||
|
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
|
||||||
print '<td align="right">'.price(-$obj->amount).'</td>';
|
print '<td class="right">'.price(-$obj->amount).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
@ -794,8 +794,8 @@ else
|
|||||||
}
|
}
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -862,8 +862,8 @@ else
|
|||||||
|
|
||||||
print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
|
print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
|
||||||
|
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount_ht).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount_ht).'</td>';
|
||||||
print '<td align="right">'.price(-$obj->amount_ttc).'</td>';
|
print '<td class="right">'.price(-$obj->amount_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -879,8 +879,8 @@ else
|
|||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
|
print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -943,8 +943,8 @@ else
|
|||||||
|
|
||||||
print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
|
print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
|
||||||
|
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price($obj->amount).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
|
||||||
print '<td align="right">'.price($obj->amount).'</td>';
|
print '<td class="right">'.price($obj->amount).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
@ -962,8 +962,8 @@ else
|
|||||||
}
|
}
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
|
print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
|
print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1024,8 +1024,8 @@ else
|
|||||||
}
|
}
|
||||||
print '<tr class="oddeven"><td> </td>';
|
print '<tr class="oddeven"><td> </td>';
|
||||||
print "<td>".$langs->trans("VATToPay")."</td>\n";
|
print "<td>".$langs->trans("VATToPay")."</td>\n";
|
||||||
print "<td align=\"right\"> </td>\n";
|
print '<td class="right"> </td>'."\n";
|
||||||
print "<td align=\"right\">".price($amount)."</td>\n";
|
print '<td class="right">'.price($amount)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
// TVA a recuperer
|
// TVA a recuperer
|
||||||
@ -1072,9 +1072,9 @@ else
|
|||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
print '<tr class="oddeven"><td> </td>';
|
print '<tr class="oddeven"><td> </td>';
|
||||||
print "<td>".$langs->trans("VATToCollect")."</td>\n";
|
print '<td>'.$langs->trans("VATToCollect")."</td>\n";
|
||||||
print "<td align=\"right\"> </td>\n";
|
print '<td class="right"> </td>'."\n";
|
||||||
print "<td align=\"right\">".price($amount)."</td>\n";
|
print '<td class="right">'.price($amount)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -1119,8 +1119,8 @@ else
|
|||||||
print '<tr class="oddeven"><td> </td>';
|
print '<tr class="oddeven"><td> </td>';
|
||||||
print "<td>".$langs->trans("VATPaid")."</td>\n";
|
print "<td>".$langs->trans("VATPaid")."</td>\n";
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print "<td align=\"right\">".price($amount)."</td>\n";
|
print '<td <class="right">'.price($amount)."</td>\n";
|
||||||
print "<td align=\"right\">".price($amount)."</td>\n";
|
print '<td class="right">'.price($amount)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
// VAT really received
|
// VAT really received
|
||||||
@ -1165,8 +1165,8 @@ else
|
|||||||
print '<tr class="oddeven"><td> </td>';
|
print '<tr class="oddeven"><td> </td>';
|
||||||
print "<td>".$langs->trans("VATCollected")."</td>\n";
|
print "<td>".$langs->trans("VATCollected")."</td>\n";
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print "<td align=\"right\">".price($amount)."</td>\n";
|
print '<td class="right">'.price($amount)."</td>\n";
|
||||||
print "<td align=\"right\">".price($amount)."</td>\n";
|
print '<td class="right">'.price($amount)."</td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1175,8 +1175,8 @@ else
|
|||||||
{
|
{
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td colspan="3" align="right"> </td>';
|
print '<td colspan="3" class="right"> </td>';
|
||||||
print '<td colspan="3" align="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
|
print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1199,10 +1199,10 @@ if ($mysoc->tva_assuj != 'franchise') // Assujetti
|
|||||||
print '<td colspan="4"> </td>';
|
print '<td colspan="4"> </td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
|
print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
|
||||||
if ($modecompta == 'CREANCES-DETTES')
|
if ($modecompta == 'CREANCES-DETTES')
|
||||||
print '<td class="liste_total" align="right">'.price(price2num($total_ht, 'MT')).'</td>';
|
print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
|
||||||
print '<td class="liste_total" align="right">'.price(price2num($total_ttc, 'MT')).'</td>';
|
print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -322,18 +322,15 @@ if (!empty($sql_select))
|
|||||||
$sql.=")";
|
$sql.=")";
|
||||||
}
|
}
|
||||||
$sql.= $db->order($sortfield, $sortorder);
|
$sql.= $db->order($sortfield, $sortorder);
|
||||||
//print ($sql);exit;
|
|
||||||
$resql=$db->query($sql);
|
$resql=$db->query($sql);
|
||||||
$totalnboflines = $db->num_rows($resql);
|
$totalnboflines = $db->num_rows($resql);
|
||||||
|
|
||||||
$sql.= $db->plimit($limit + 1, $offset);
|
$sql.= $db->plimit($limit + 1, $offset);
|
||||||
//print $sql;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$disabled=0;
|
$disabled=0;
|
||||||
$showempty=2;
|
$showempty=2;
|
||||||
if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur)
|
if (empty($elementTypeArray) && ! $object->thirdparty->client && ! $object->thirdparty->fournisseur) {
|
||||||
{
|
|
||||||
$showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
|
$showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
|
||||||
$disabled=1;
|
$disabled=1;
|
||||||
}
|
}
|
||||||
@ -491,9 +488,8 @@ if ($sql_select)
|
|||||||
$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
|
$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($objp->info_bits & 2) == 2) { ?>
|
if (($objp->info_bits & 2) == 2) {
|
||||||
<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$object->id; ?>">
|
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'">';
|
||||||
<?php
|
|
||||||
$txt='';
|
$txt='';
|
||||||
print img_object($langs->trans("ShowReduc"), 'reduc').' ';
|
print img_object($langs->trans("ShowReduc"), 'reduc').' ';
|
||||||
if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
|
if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
|
||||||
@ -501,9 +497,7 @@ if ($sql_select)
|
|||||||
elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
|
elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
|
||||||
//else $txt=$langs->trans("Discount");
|
//else $txt=$langs->trans("Discount");
|
||||||
print $txt;
|
print $txt;
|
||||||
?>
|
print '</a>';
|
||||||
</a>
|
|
||||||
<?php
|
|
||||||
if ($objp->description)
|
if ($objp->description)
|
||||||
{
|
{
|
||||||
if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
|
if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
|
||||||
|
|||||||
@ -141,7 +141,7 @@ class box_actions extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="left" class="nowrap"',
|
'td' => 'class="nowrap left"',
|
||||||
'text' => dol_print_date($datelimite, "dayhour"),
|
'text' => dol_print_date($datelimite, "dayhour"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -151,7 +151,7 @@ class box_actions extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $actionstatic->LibStatut($objp->percentage, 3),
|
'text' => $actionstatic->LibStatut($objp->percentage, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -160,7 +160,7 @@ class box_actions extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoActionsToDo"),
|
'text'=>$langs->trans("NoActionsToDo"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -174,7 +174,7 @@ class box_actions extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -220,13 +220,13 @@ class box_actions extends ModeleBoxes
|
|||||||
$dateligne=$contents[$line][4]['text'];
|
$dateligne=$contents[$line][4]['text'];
|
||||||
$percentage=$contents[$line][5]['text'];
|
$percentage=$contents[$line][5]['text'];
|
||||||
$out.= '<tr class="oddeven">';
|
$out.= '<tr class="oddeven">';
|
||||||
$out.= '<td align=center>';
|
$out.= '<td class="center">';
|
||||||
$out.= img_object("", $logo);
|
$out.= img_object("", $logo);
|
||||||
$out.= '</td>';
|
$out.= '</td>';
|
||||||
$out.= '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
|
$out.= '<td class="center"><a href="'.$urlevent.'">'.$label.'</a></td>';
|
||||||
$out.= '<td align=center><a href="'.$urlsoc.'">'.img_object("", $logosoc)." ".$nomsoc.'</a></td>';
|
$out.= '<td class="center"><a href="'.$urlsoc.'">'.img_object("", $logosoc)." ".$nomsoc.'</a></td>';
|
||||||
$out.= '<td align=center>'.$dateligne.'</td>';
|
$out.= '<td class="center">'.$dateligne.'</td>';
|
||||||
$out.= '<td align=center>'.$percentage.'</td>';
|
$out.= '<td class="center">'.$percentage.'</td>';
|
||||||
$out.= '</tr>';
|
$out.= '</tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -153,7 +153,7 @@ class box_activity extends ModeleBoxes
|
|||||||
while ($j < count($data))
|
while ($j < count($data))
|
||||||
{
|
{
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&viewstatut=".$data[$j]->fk_statut,
|
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&viewstatut=".$data[$j]->fk_statut,
|
||||||
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
|
||||||
'logo' => 'object_propal'
|
'logo' => 'object_propal'
|
||||||
@ -177,7 +177,7 @@ class box_activity extends ModeleBoxes
|
|||||||
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
|
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
|
||||||
);
|
);
|
||||||
$this->info_box_contents[$line][4] = array(
|
$this->info_box_contents[$line][4] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
|
'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -236,7 +236,7 @@ class box_activity extends ModeleBoxes
|
|||||||
$j=0;
|
$j=0;
|
||||||
while ($j < count($data)) {
|
while ($j < count($data)) {
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$data[$j]->fk_statut,
|
'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$data[$j]->fk_statut,
|
||||||
'tooltip' => $langs->trans("Orders")." ".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
|
'tooltip' => $langs->trans("Orders")." ".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
|
||||||
'logo' => 'object_order',
|
'logo' => 'object_order',
|
||||||
@ -260,7 +260,7 @@ class box_activity extends ModeleBoxes
|
|||||||
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
|
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
|
||||||
);
|
);
|
||||||
$this->info_box_contents[$line][4] = array(
|
$this->info_box_contents[$line][4] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
|
'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -321,7 +321,7 @@ class box_activity extends ModeleBoxes
|
|||||||
while ($j < count($data)) {
|
while ($j < count($data)) {
|
||||||
$billurl="search_status=2&paye=1&year=".$data[$j]->annee;
|
$billurl="search_status=2&paye=1&year=".$data[$j]->annee;
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
|
||||||
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
||||||
'logo' => 'bill',
|
'logo' => 'bill',
|
||||||
@ -348,7 +348,7 @@ class box_activity extends ModeleBoxes
|
|||||||
$totalnb += $data[$j]->nb;
|
$totalnb += $data[$j]->nb;
|
||||||
|
|
||||||
$this->info_box_contents[$line][4] = array(
|
$this->info_box_contents[$line][4] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
|
'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
|
||||||
);
|
);
|
||||||
$line++;
|
$line++;
|
||||||
@ -356,7 +356,7 @@ class box_activity extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
if (count($data)==0)
|
if (count($data)==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedInvoices"),
|
'text'=>$langs->trans("NoRecordedInvoices"),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -403,7 +403,7 @@ class box_activity extends ModeleBoxes
|
|||||||
while ($j < count($data)) {
|
while ($j < count($data)) {
|
||||||
$billurl="search_status=".$data[$j]->fk_statut."&paye=0";
|
$billurl="search_status=".$data[$j]->fk_statut."&paye=0";
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
|
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
|
||||||
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
|
||||||
'logo' => 'bill',
|
'logo' => 'bill',
|
||||||
@ -426,26 +426,27 @@ class box_activity extends ModeleBoxes
|
|||||||
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
|
'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
|
||||||
);
|
);
|
||||||
$this->info_box_contents[$line][4] = array(
|
$this->info_box_contents[$line][4] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
|
'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
|
||||||
);
|
);
|
||||||
$line++;
|
$line++;
|
||||||
$j++;
|
$j++;
|
||||||
}
|
}
|
||||||
if ($num==0)
|
if ($num==0) {
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedInvoices"),
|
'text'=>$langs->trans("NoRecordedInvoices"),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Add the sum in the bottom of the boxes
|
// Add the sum in the bottom of the boxes
|
||||||
$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
|
$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
|
||||||
$this->info_box_contents[$line][1] = array('td' => 'align="left" class="liste_total" ', 'text' => $langs->trans("Total")." ".$textHead);
|
$this->info_box_contents[$line][1] = array('td' => 'class="liste_total left" ', 'text' => $langs->trans("Total")." ".$textHead);
|
||||||
$this->info_box_contents[$line][2] = array('td' => 'align="right" class="liste_total" ', 'text' => $totalnb);
|
$this->info_box_contents[$line][2] = array('td' => 'class="liste_total right" ', 'text' => $totalnb);
|
||||||
$this->info_box_contents[$line][3] = array('td' => 'align="right" class="liste_total" ', 'text' => '');
|
$this->info_box_contents[$line][3] = array('td' => 'class="liste_total right" ', 'text' => '');
|
||||||
$this->info_box_contents[$line][4] = array('td' => 'align="right" class="liste_total" ', 'text' => "");
|
$this->info_box_contents[$line][4] = array('td' => 'class="liste_total right" ', 'text' => "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -106,7 +106,7 @@ class box_bookmarks extends ModeleBoxes
|
|||||||
$objp = $db->fetch_object($result);
|
$objp = $db->fetch_object($result);
|
||||||
|
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'logo' => $this->boximg,
|
'logo' => $this->boximg,
|
||||||
'url' => $objp->url,
|
'url' => $objp->url,
|
||||||
'tooltip' => $objp->title,
|
'tooltip' => $objp->title,
|
||||||
@ -127,7 +127,7 @@ class box_bookmarks extends ModeleBoxes
|
|||||||
$mytxt=$langs->trans("NoRecordedBookmarks");
|
$mytxt=$langs->trans("NoRecordedBookmarks");
|
||||||
if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
|
if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center" colspan="2"',
|
'td' => 'class="center" colspan="2"',
|
||||||
'tooltip' => $mytxt,
|
'tooltip' => $mytxt,
|
||||||
'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
|
'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
|
||||||
);
|
);
|
||||||
@ -143,7 +143,7 @@ class box_bookmarks extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -140,26 +140,28 @@ class box_clients extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $thirdpartystatic->LibStatut($objp->status, 3)
|
'text' => $thirdpartystatic->LibStatut($objp->status, 3)
|
||||||
);
|
);
|
||||||
|
|
||||||
$line++;
|
$line++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
|
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedCustomers"));
|
||||||
|
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array( 'td' => '',
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'td' => '',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => ($db->error().' sql='.$sql));
|
'text' => ($db->error().' sql='.$sql)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -165,14 +165,14 @@ class box_commandes extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
|
'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
$line++;
|
$line++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
|
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedOrders"));
|
||||||
|
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
} else {
|
} else {
|
||||||
@ -184,7 +184,7 @@ class box_commandes extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -145,16 +145,16 @@ class box_comptes extends ModeleBoxes
|
|||||||
foreach ($solde_total as $key=>$solde) {
|
foreach ($solde_total as $key=>$solde) {
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'tr' => 'class="liste_total"',
|
'tr' => 'class="liste_total"',
|
||||||
'td' => 'align="left" class="liste_total"',
|
'td' => 'class="liste_total left"',
|
||||||
'text' => $langs->trans('Total').' '.$key,
|
'text' => $langs->trans('Total').' '.$key,
|
||||||
);
|
);
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" class="liste_total"',
|
'td' => 'class="liste_total right"',
|
||||||
'text' => ' '
|
'text' => ' '
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" class="liste_total"',
|
'td' => 'class="liste_total right"',
|
||||||
'text' => price($solde, 0, $langs, 0, -1, -1, $key)
|
'text' => price($solde, 0, $langs, 0, -1, -1, $key)
|
||||||
);
|
);
|
||||||
$line++;
|
$line++;
|
||||||
@ -170,7 +170,7 @@ class box_comptes extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -147,7 +147,7 @@ class box_contacts extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" class="nowrap" width="18"',
|
'td' => 'class="nowrap right" width="18"',
|
||||||
'text' => $contactstatic->getLibStatut(3),
|
'text' => $contactstatic->getLibStatut(3),
|
||||||
'asis'=>1,
|
'asis'=>1,
|
||||||
);
|
);
|
||||||
@ -157,7 +157,7 @@ class box_contacts extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedContacts"),
|
'text'=>$langs->trans("NoRecordedContacts"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -171,7 +171,7 @@ class box_contacts extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -161,7 +161,7 @@ class box_contracts extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center opacitymedium"',
|
'td' => 'class="center opacitymedium"',
|
||||||
'text'=>$langs->trans("NoRecordedContracts"),
|
'text'=>$langs->trans("NoRecordedContracts"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -175,7 +175,7 @@ class box_contracts extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -163,7 +163,7 @@ class box_external_rss extends ModeleBoxes
|
|||||||
$tooltip.= '<br>'.$description;
|
$tooltip.= '<br>'.$description;
|
||||||
|
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'logo' => $this->boximg,
|
'logo' => $this->boximg,
|
||||||
'url' => $href,
|
'url' => $href,
|
||||||
'tooltip' => $tooltip,
|
'tooltip' => $tooltip,
|
||||||
@ -180,7 +180,7 @@ class box_external_rss extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][2] = array(
|
$this->info_box_contents[$line][2] = array(
|
||||||
'td' => 'align="right" nowrap="1"',
|
'td' => 'class="right nowrap"',
|
||||||
'text' => $date,
|
'text' => $date,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -172,7 +172,7 @@ class box_factures extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
|
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -181,7 +181,7 @@ class box_factures extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedInvoices"),
|
'text'=>$langs->trans("NoRecordedInvoices"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -195,7 +195,7 @@ class box_factures extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -177,7 +177,7 @@ class box_factures_fourn extends ModeleBoxes
|
|||||||
$fac->fetch($objp->facid);
|
$fac->fetch($objp->facid);
|
||||||
$alreadypaid=$fac->getSommePaiement();
|
$alreadypaid=$fac->getSommePaiement();
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
|
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -186,7 +186,7 @@ class box_factures_fourn extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoModifiedSupplierBills"),
|
'text'=>$langs->trans("NoModifiedSupplierBills"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -200,7 +200,7 @@ class box_factures_fourn extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->transnoentities("ReadPermissionNotAllowed")
|
'text' => $langs->transnoentities("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -164,7 +164,7 @@ class box_factures_fourn_imp extends ModeleBoxes
|
|||||||
$fac->fetch($objp->facid);
|
$fac->fetch($objp->facid);
|
||||||
$alreadypaid=$fac->getSommePaiement();
|
$alreadypaid=$fac->getSommePaiement();
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
|
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -173,7 +173,7 @@ class box_factures_fourn_imp extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoUnpaidSupplierBills"),
|
'text'=>$langs->trans("NoUnpaidSupplierBills"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -187,7 +187,7 @@ class box_factures_fourn_imp extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -171,14 +171,14 @@ class box_factures_imp extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
|
'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
|
||||||
);
|
);
|
||||||
|
|
||||||
$line++;
|
$line++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
|
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoUnpaidCustomerBills"));
|
||||||
|
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
}
|
}
|
||||||
@ -193,7 +193,7 @@ class box_factures_imp extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -114,45 +114,55 @@ class box_ficheinter extends ModeleBoxes
|
|||||||
$ficheinterstatic->id=$objp->rowid;
|
$ficheinterstatic->id=$objp->rowid;
|
||||||
$ficheinterstatic->ref=$objp->ref;
|
$ficheinterstatic->ref=$objp->ref;
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => '',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => '',
|
||||||
'text' => $ficheinterstatic->getNomUrl(1),
|
'text' => $ficheinterstatic->getNomUrl(1),
|
||||||
'asis' => 1
|
'asis' => 1,
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="left" width="16"',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="left" width="16"',
|
||||||
'logo' => 'company',
|
'logo' => 'company',
|
||||||
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
|
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid,
|
||||||
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => '',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => '',
|
||||||
'text' => dol_trunc($objp->name, 40),
|
'text' => dol_trunc($objp->name, 40),
|
||||||
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
|
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid,
|
||||||
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'class="right"',
|
$this->info_box_contents[$i][] = array(
|
||||||
'text' => dol_print_date($datec, 'day'));
|
'td' => 'class="right"',
|
||||||
|
'text' => dol_print_date($datec, 'day'),
|
||||||
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="right" class="nowrap"',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="nowrap right"',
|
||||||
'text' => $ficheinterstatic->getLibStatut(6),
|
'text' => $ficheinterstatic->getLibStatut(6),
|
||||||
'asis'=>1
|
'asis' => 1,
|
||||||
);
|
);
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0) $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
|
if ($num==0) $this->info_box_contents[$i][] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedInterventions"));
|
||||||
|
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][] = array( 'td' => '',
|
$this->info_box_contents[0][] = array(
|
||||||
|
'td' => '',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => ($db->error().' sql='.$sql));
|
'text' => ($db->error().' sql='.$sql),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][] = array(
|
$this->info_box_contents[0][] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,7 +124,7 @@ class box_fournisseurs extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $thirdpartystatic->LibStatut($objp->status, 3),
|
'text' => $thirdpartystatic->LibStatut($objp->status, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -132,7 +132,7 @@ class box_fournisseurs extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0) $this->info_box_contents[$line][0] = array(
|
if ($num==0) $this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedSuppliers"),
|
'text'=>$langs->trans("NoRecordedSuppliers"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -146,7 +146,7 @@ class box_fournisseurs extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -136,26 +136,28 @@ class box_goodcustomers extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $thirdpartystatic->LibStatut($objp->status, 3)
|
'text' => $thirdpartystatic->LibStatut($objp->status, 3)
|
||||||
);
|
);
|
||||||
|
|
||||||
$line++;
|
$line++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
|
if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedCustomers"));
|
||||||
|
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array( 'td' => '',
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'td' => '',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => ($db->error().' sql='.$sql));
|
'text' => ($db->error().' sql='.$sql),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -252,16 +252,16 @@ class box_graph_invoices_permonth extends ModeleBoxes
|
|||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
}
|
}
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
|
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"','textnoformat'=>$stringtoshow);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"', 'maxlength'=>500, 'text' => $mesg);
|
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -249,18 +249,21 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
|
|||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
}
|
}
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"','td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
|
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"','td' => 'class="nohover center"','textnoformat'=>$stringtoshow);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover left"',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => $mesg);
|
'text' => $mesg,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -248,18 +248,25 @@ class box_graph_orders_permonth extends ModeleBoxes
|
|||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
}
|
}
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover center"',
|
||||||
|
'textnoformat'=>$stringtoshow,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover left"',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => $mesg);
|
'text' => $mesg,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -247,18 +247,25 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
|
|||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
}
|
}
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover center"',
|
||||||
|
'textnoformat'=>$stringtoshow,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover left"',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => $mesg);
|
'text' => $mesg,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -392,12 +392,16 @@ class box_graph_product_distribution extends ModeleBoxes
|
|||||||
$stringtoshow.=$px3->show();
|
$stringtoshow.=$px3->show();
|
||||||
$stringtoshow.='</div></div>';
|
$stringtoshow.='</div></div>';
|
||||||
}
|
}
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover center"',
|
||||||
|
'textnoformat'=>$stringtoshow,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => $mesg
|
'text' => $mesg
|
||||||
);
|
);
|
||||||
|
|||||||
@ -251,18 +251,25 @@ class box_graph_propales_permonth extends ModeleBoxes
|
|||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
$stringtoshow.='</div>';
|
$stringtoshow.='</div>';
|
||||||
}
|
}
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="center" class="nohover"','textnoformat'=>$stringtoshow);
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover center"',
|
||||||
|
'textnoformat'=>$stringtoshow,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'align="left" class="nohover"',
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'tr'=>'class="oddeven nohover"',
|
||||||
|
'td' => 'class="nohover left"',
|
||||||
'maxlength' => 500,
|
'maxlength' => 500,
|
||||||
'text' => $mesg);
|
'text' => $mesg,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Module descriptor for ticket system
|
/* Module descriptor for ticket system
|
||||||
* Copyright (C) - 2013-2016 Jean-François FERRY <hello@librethic.io>
|
* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io>
|
||||||
* 2016 Christophe Battarel <christophe@altairis.fr>
|
* 2016 Christophe Battarel <christophe@altairis.fr>
|
||||||
|
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -75,8 +76,10 @@ class box_last_modified_ticket extends ModeleBoxes
|
|||||||
'limit' => dol_strlen($text)
|
'limit' => dol_strlen($text)
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[0][0] = array('td' => 'align="left"',
|
$this->info_box_contents[0][0] = array(
|
||||||
'text' => $langs->trans("BoxLastModifiedTicketContent"));
|
'td' => 'class="left"',
|
||||||
|
'text' => $langs->trans("BoxLastModifiedTicketContent"),
|
||||||
|
);
|
||||||
|
|
||||||
if ($user->rights->ticket->read) {
|
if ($user->rights->ticket->read) {
|
||||||
$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
|
$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
|
||||||
@ -119,28 +122,31 @@ class box_last_modified_ticket extends ModeleBoxes
|
|||||||
|
|
||||||
// Picto
|
// Picto
|
||||||
$this->info_box_contents[$i][0] = array(
|
$this->info_box_contents[$i][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'logo' => $this->boximg,
|
'logo' => $this->boximg,
|
||||||
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
|
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1),
|
||||||
|
);
|
||||||
$r++;
|
$r++;
|
||||||
|
|
||||||
// Id
|
// Id
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="left"',
|
'td' => 'class="left"',
|
||||||
'text' => $objp->ref,
|
'text' => $objp->ref,
|
||||||
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
|
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1),
|
||||||
|
);
|
||||||
$r++;
|
$r++;
|
||||||
|
|
||||||
// Subject
|
// Subject
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="left"',
|
'td' => 'class="left"',
|
||||||
'text' => $objp->subject, // Some event have no ref
|
'text' => $objp->subject, // Some event have no ref
|
||||||
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1));
|
'url' => dol_buildpath("/ticket/card.php?track_id=".$objp->track_id, 1),
|
||||||
|
);
|
||||||
$r++;
|
$r++;
|
||||||
|
|
||||||
// Customer
|
// Customer
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="left"',
|
'td' => 'class="left"',
|
||||||
'logo' => ($objp->fk_soc>0?'company':''),
|
'logo' => ($objp->fk_soc>0?'company':''),
|
||||||
'text' => ($objp->company_name?$objp->company_name:$objp->origin_email),
|
'text' => ($objp->company_name?$objp->company_name:$objp->origin_email),
|
||||||
'url' => ($objp->fk_soc>0?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc:'')
|
'url' => ($objp->fk_soc>0?DOL_URL_ROOT."/comm/card.php?socid=".$objp->fk_soc:'')
|
||||||
@ -150,7 +156,7 @@ class box_last_modified_ticket extends ModeleBoxes
|
|||||||
|
|
||||||
// Date creation
|
// Date creation
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="right"',
|
'td' => 'class="right"',
|
||||||
'text' => dol_print_date($db->idate($objp->datec), 'dayhour')
|
'text' => dol_print_date($db->idate($objp->datec), 'dayhour')
|
||||||
);
|
);
|
||||||
$r++;
|
$r++;
|
||||||
@ -159,7 +165,7 @@ class box_last_modified_ticket extends ModeleBoxes
|
|||||||
$ticketstat = new Ticket($this->db);
|
$ticketstat = new Ticket($this->db);
|
||||||
$ticketstat->fk_statut = $objp->fk_statut;
|
$ticketstat->fk_statut = $objp->fk_statut;
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="right"',
|
'td' => 'class="right"',
|
||||||
'text' => $ticketstat->getLibStatut(3)
|
'text' => $ticketstat->getLibStatut(3)
|
||||||
);
|
);
|
||||||
$r++;
|
$r++;
|
||||||
@ -168,14 +174,16 @@ class box_last_modified_ticket extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0) {
|
if ($num==0) {
|
||||||
$this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
|
$this->info_box_contents[$i][0] = array('td' => 'class="center"','text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array('td' => 'align="left"',
|
$this->info_box_contents[0][0] = array(
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed"));
|
'td' => 'class="left"',
|
||||||
|
'text' => $langs->trans("ReadPermissionNotAllowed"),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -75,8 +75,10 @@ class box_last_ticket extends ModeleBoxes
|
|||||||
'limit' => dol_strlen($text),
|
'limit' => dol_strlen($text),
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[0][0] = array('td' => 'align="left"',
|
$this->info_box_contents[0][0] = array(
|
||||||
'text' => $langs->trans("BoxLastTicketContent"));
|
'td' => 'class="left"',
|
||||||
|
'text' => $langs->trans("BoxLastTicketContent"),
|
||||||
|
);
|
||||||
|
|
||||||
if ($user->rights->ticket->read) {
|
if ($user->rights->ticket->read) {
|
||||||
$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
|
$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
|
||||||
@ -120,28 +122,31 @@ class box_last_ticket extends ModeleBoxes
|
|||||||
|
|
||||||
// Picto
|
// Picto
|
||||||
$this->info_box_contents[$i][0] = array(
|
$this->info_box_contents[$i][0] = array(
|
||||||
'td' => 'align="left" width="16"',
|
'td' => 'class="left" width="16"',
|
||||||
'logo' => $this->boximg,
|
'logo' => $this->boximg,
|
||||||
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
|
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1),
|
||||||
|
);
|
||||||
$r++;
|
$r++;
|
||||||
|
|
||||||
// Id
|
// Id
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="left"',
|
'td' => 'class="left"',
|
||||||
'text' => $objp->ref,
|
'text' => $objp->ref,
|
||||||
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
|
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1),
|
||||||
|
);
|
||||||
$r++;
|
$r++;
|
||||||
|
|
||||||
// Subject
|
// Subject
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="left"',
|
'td' => 'class="left"',
|
||||||
'text' => $objp->subject, // Some event have no ref
|
'text' => $objp->subject, // Some event have no ref
|
||||||
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1));
|
'url' => dol_buildpath("/ticket/card.php?track_id=" . $objp->track_id, 1),
|
||||||
|
);
|
||||||
$r++;
|
$r++;
|
||||||
|
|
||||||
// Customer
|
// Customer
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="left"',
|
'td' => 'class="left"',
|
||||||
'logo' => ($objp->fk_soc > 0 ? 'company' : ''),
|
'logo' => ($objp->fk_soc > 0 ? 'company' : ''),
|
||||||
'text' => ($objp->company_name ? $objp->company_name : $objp->origin_email),
|
'text' => ($objp->company_name ? $objp->company_name : $objp->origin_email),
|
||||||
'url' => ($objp->fk_soc > 0 ? DOL_URL_ROOT . "/comm/card.php?socid=" . $objp->fk_soc : ''),
|
'url' => ($objp->fk_soc > 0 ? DOL_URL_ROOT . "/comm/card.php?socid=" . $objp->fk_soc : ''),
|
||||||
@ -150,7 +155,7 @@ class box_last_ticket extends ModeleBoxes
|
|||||||
|
|
||||||
// Date creation
|
// Date creation
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="right"',
|
'td' => 'class="right"',
|
||||||
'text' => dol_print_date($db->idate($objp->datec), 'dayhour'),
|
'text' => dol_print_date($db->idate($objp->datec), 'dayhour'),
|
||||||
);
|
);
|
||||||
$r++;
|
$r++;
|
||||||
@ -159,7 +164,7 @@ class box_last_ticket extends ModeleBoxes
|
|||||||
$ticketstat = new Ticket($this->db);
|
$ticketstat = new Ticket($this->db);
|
||||||
$ticketstat->fk_statut = $objp->fk_statut;
|
$ticketstat->fk_statut = $objp->fk_statut;
|
||||||
$this->info_box_contents[$i][$r] = array(
|
$this->info_box_contents[$i][$r] = array(
|
||||||
'td' => 'align="right"',
|
'td' => 'class="right"',
|
||||||
'text' => $ticketstat->getLibStatut(3),
|
'text' => $ticketstat->getLibStatut(3),
|
||||||
);
|
);
|
||||||
$r++;
|
$r++;
|
||||||
@ -168,13 +173,13 @@ class box_last_ticket extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($num == 0) {
|
if ($num == 0) {
|
||||||
$this->info_box_contents[$i][0] = array('td' => 'align="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
|
$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array('td' => 'align="left"',
|
$this->info_box_contents[0][0] = array('td' => 'class="left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed"));
|
'text' => $langs->trans("ReadPermissionNotAllowed"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -141,7 +141,7 @@ class box_members extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $db->jdate($objp->date_end_subscription), 3),
|
'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $db->jdate($objp->date_end_subscription), 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -150,7 +150,7 @@ class box_members extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedCustomers"),
|
'text'=>$langs->trans("NoRecordedCustomers"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -164,7 +164,7 @@ class box_members extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -183,13 +183,13 @@ class box_produits extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
|
'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
|
'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
@ -198,7 +198,7 @@ class box_produits extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedProducts"),
|
'text'=>$langs->trans("NoRecordedProducts"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -212,7 +212,7 @@ class box_produits extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -187,18 +187,19 @@ class box_produits_alerte_stock extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
|
'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
|
||||||
'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
|
'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
|
||||||
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
|
'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
|
'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
@ -207,7 +208,7 @@ class box_produits_alerte_stock extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoTooLowStockProducts"),
|
'text'=>$langs->trans("NoTooLowStockProducts"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -224,7 +225,7 @@ class box_produits_alerte_stock extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -174,11 +174,11 @@ class box_project extends ModeleBoxes
|
|||||||
'text' => " ",
|
'text' => " ",
|
||||||
);
|
);
|
||||||
$this->info_box_contents[$i][] = array(
|
$this->info_box_contents[$i][] = array(
|
||||||
'td' => 'align="right" ',
|
'td' => 'class="right" ',
|
||||||
'text' => round($num, 0)." ".$langs->trans("Projects"),
|
'text' => round($num, 0)." ".$langs->trans("Projects"),
|
||||||
);
|
);
|
||||||
$this->info_box_contents[$i][] = array(
|
$this->info_box_contents[$i][] = array(
|
||||||
'td' => 'align="right" ',
|
'td' => 'class="right" ',
|
||||||
'text' => (($max < $num) ? '' : (round($totalnbTask, 0)." ".$langs->trans("Tasks"))),
|
'text' => (($max < $num) ? '' : (round($totalnbTask, 0)." ".$langs->trans("Tasks"))),
|
||||||
);
|
);
|
||||||
$this->info_box_contents[$i][] = array(
|
$this->info_box_contents[$i][] = array(
|
||||||
|
|||||||
@ -151,7 +151,7 @@ class box_propales extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
|
'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -160,7 +160,7 @@ class box_propales extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num==0)
|
if ($num==0)
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedProposals"),
|
'text'=>$langs->trans("NoRecordedProposals"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -174,7 +174,7 @@ class box_propales extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -134,23 +134,24 @@ class box_prospect extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
|
'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $thirdpartystatic->LibStatut($objp->status, 3),
|
'text' => $thirdpartystatic->LibStatut($objp->status, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
$line++;
|
$line++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($num==0)
|
if ($num==0) {
|
||||||
$this->info_box_contents[$line][0] = array(
|
$this->info_box_contents[$line][0] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text'=>$langs->trans("NoRecordedProspects"),
|
'text'=>$langs->trans("NoRecordedProspects"),
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
} else {
|
} else {
|
||||||
@ -162,7 +163,7 @@ class box_prospect extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -190,44 +190,52 @@ class box_services_contracts extends ModeleBoxes
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
|
||||||
'text' => $s,
|
'text' => $s,
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => '',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => '',
|
||||||
'text' => $contractstatic->getNomUrl(1),
|
'text' => $contractstatic->getNomUrl(1),
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
|
||||||
'text' => $thirdpartytmp->getNomUrl(1),
|
'text' => $thirdpartytmp->getNomUrl(1),
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => '',
|
$this->info_box_contents[$i][] = array(
|
||||||
'text' => dol_print_date($datem, 'day'));
|
'td' => '',
|
||||||
|
'text' => dol_print_date($datem, 'day'),
|
||||||
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $contratlignestatic->LibStatut($objp->statut, 3)
|
'text' => $contratlignestatic->LibStatut($objp->statut, 3)
|
||||||
);
|
);
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoContractedProducts"));
|
if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'class="center"','text'=>$langs->trans("NoContractedProducts"));
|
||||||
|
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array( 'td' => '',
|
$this->info_box_contents[0][0] = array(
|
||||||
|
'td' => '',
|
||||||
'maxlength' => 500,
|
'maxlength' => 500,
|
||||||
'text' => ($db->error().' sql='.$sql));
|
'text' => ($db->error().' sql='.$sql),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -132,22 +132,28 @@ class box_services_expired extends ModeleBoxes
|
|||||||
$dateline=$db->jdate($objp->date_line);
|
$dateline=$db->jdate($objp->date_line);
|
||||||
if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
|
if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => '',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => '',
|
||||||
'text' => $contract->getNomUrl(1),
|
'text' => $contract->getNomUrl(1),
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax150 maxwidth150onsmartphone" align="left"',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone left"',
|
||||||
'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
|
'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
|
||||||
'asis' => 1
|
'asis' => 1
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="center"',
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="center"',
|
||||||
'text' => dol_print_date($dateline, 'day'),
|
'text' => dol_print_date($dateline, 'day'),
|
||||||
'text2'=> $late);
|
'text2'=> $late,
|
||||||
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'class="right"',
|
$this->info_box_contents[$i][] = array(
|
||||||
'text' => $objp->nb_services);
|
'td' => 'class="right"',
|
||||||
|
'text' => $objp->nb_services,
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
@ -156,22 +162,27 @@ class box_services_expired extends ModeleBoxes
|
|||||||
if ($num==0)
|
if ($num==0)
|
||||||
{
|
{
|
||||||
$langs->load("contracts");
|
$langs->load("contracts");
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="center" class="nohover opacitymedium"','text'=>$langs->trans("NoExpiredServices"));
|
$this->info_box_contents[$i][] = array(
|
||||||
|
'td' => 'class="nohover opacitymedium center"',
|
||||||
|
'text' => $langs->trans("NoExpiredServices"),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][] = array( 'td' => '',
|
$this->info_box_contents[0][] = array(
|
||||||
|
'td' => '',
|
||||||
'maxlength'=>500,
|
'maxlength'=>500,
|
||||||
'text' => ($db->error().' sql='.$sql));
|
'text' => ($db->error().' sql='.$sql),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][0] = array(
|
$this->info_box_contents[0][0] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -145,7 +145,7 @@ class box_supplier_orders extends ModeleBoxes
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="right" width="18"',
|
'td' => 'class="right" width="18"',
|
||||||
'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
|
'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -154,7 +154,7 @@ class box_supplier_orders extends ModeleBoxes
|
|||||||
|
|
||||||
if ($num == 0)
|
if ($num == 0)
|
||||||
$this->info_box_contents[$line][] = array(
|
$this->info_box_contents[$line][] = array(
|
||||||
'td' => 'align="center"',
|
'td' => 'class="center"',
|
||||||
'text' => $langs->trans("NoSupplierOrder"),
|
'text' => $langs->trans("NoSupplierOrder"),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -170,7 +170,7 @@ class box_supplier_orders extends ModeleBoxes
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->info_box_contents[0][] = array(
|
$this->info_box_contents[0][] = array(
|
||||||
'td' => 'align="left" class="nohover opacitymedium"',
|
'td' => 'class="nohover opacitymedium left"',
|
||||||
'text' => $langs->trans("ReadPermissionNotAllowed")
|
'text' => $langs->trans("ReadPermissionNotAllowed")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -125,7 +125,7 @@ class box_task extends ModeleBoxes
|
|||||||
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
|
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
|
||||||
$totaldurationtot += $objp->durationtot;
|
$totaldurationtot += $objp->durationtot;
|
||||||
|
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
|
$this->info_box_contents[$i][] = array('td' => 'class="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
@ -136,9 +136,9 @@ class box_task extends ModeleBoxes
|
|||||||
|
|
||||||
// Add the sum at the bottom of the boxes
|
// Add the sum at the bottom of the boxes
|
||||||
$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")." ".$textHead);
|
$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")." ".$textHead);
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
|
$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
|
$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
|
||||||
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
|
$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
|
||||||
$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
|
$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1297,9 +1297,8 @@ class CMailFile
|
|||||||
$port, // which Port number to use
|
$port, // which Port number to use
|
||||||
$errno, // actual system level error
|
$errno, // actual system level error
|
||||||
$errstr, // and any text that goes with the error
|
$errstr, // and any text that goes with the error
|
||||||
$timeout
|
$timeout // timeout for reading/writing data over the socket
|
||||||
)) // timeout for reading/writing data over the socket
|
)) {
|
||||||
{
|
|
||||||
// Windows still does not have support for this timeout function
|
// Windows still does not have support for this timeout function
|
||||||
if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
|
if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
|
||||||
|
|
||||||
|
|||||||
@ -267,6 +267,12 @@ class HookManager
|
|||||||
|
|
||||||
if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray=array_merge($this->resArray, $actionclassinstance->results);
|
if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray=array_merge($this->resArray, $actionclassinstance->results);
|
||||||
if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
|
if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
|
||||||
|
if (is_numeric($resaction) && $resaction < 0)
|
||||||
|
{
|
||||||
|
$error++;
|
||||||
|
$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
|
||||||
|
dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",", $this->errors)), LOG_ERR);
|
||||||
|
}
|
||||||
// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
|
// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
|
||||||
if (! is_array($resaction) && ! is_numeric($resaction))
|
if (! is_array($resaction) && ! is_numeric($resaction))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -4076,7 +4076,7 @@ class Form
|
|||||||
$formconfirm.= '<td class="valid">';
|
$formconfirm.= '<td class="valid">';
|
||||||
$formconfirm.= $this->selectyesno("confirm", $newselectedchoice);
|
$formconfirm.= $this->selectyesno("confirm", $newselectedchoice);
|
||||||
$formconfirm.= '</td>';
|
$formconfirm.= '</td>';
|
||||||
$formconfirm.= '<td class="valid center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';
|
$formconfirm.= '<td class="valid center"><input class="button valignmiddle" type="submit" onclick="this.disabled=\'disabled\' value="'.$langs->trans("Validate").'"></td>';
|
||||||
$formconfirm.= '</tr>'."\n";
|
$formconfirm.= '</tr>'."\n";
|
||||||
|
|
||||||
$formconfirm.= '</table>'."\n";
|
$formconfirm.= '</table>'."\n";
|
||||||
|
|||||||
@ -757,6 +757,9 @@ class FormCompany
|
|||||||
}
|
}
|
||||||
print "</select>";
|
print "</select>";
|
||||||
if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
|
if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
|
||||||
|
|
||||||
|
print ajax_combobox($htmlname);
|
||||||
|
|
||||||
print "\n";
|
print "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -426,8 +426,7 @@ class FormMail extends Form
|
|||||||
$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
|
$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
|
||||||
$out.= ' ';
|
$out.= ' ';
|
||||||
$out.= '</div>';
|
$out.= '</div>';
|
||||||
}
|
} elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
|
||||||
elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
|
|
||||||
'propal_send','order_send','facture_send',
|
'propal_send','order_send','facture_send',
|
||||||
'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
|
'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
|
||||||
'invoice_supplier_send','thirdparty','contract','user','all'
|
'invoice_supplier_send','thirdparty','contract','user','all'
|
||||||
|
|||||||
@ -157,12 +157,12 @@ class FormTicket
|
|||||||
}
|
}
|
||||||
print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">';
|
print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">';
|
||||||
|
|
||||||
print '<table class="border">';
|
print '<table class="border centpercent">';
|
||||||
|
|
||||||
if ($this->withref) {
|
if ($this->withref) {
|
||||||
// Ref
|
// Ref
|
||||||
$defaultref = $ticketstat->getDefaultRef();
|
$defaultref = $ticketstat->getDefaultRef();
|
||||||
print '<tr><td class="titlefield"><span class="fieldrequired">' . $langs->trans("Ref") . '</span></td><td><input size="18" type="text" name="ref" value="' . (GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref) . '"></td></tr>';
|
print '<tr><td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("Ref") . '</span></td><td><input size="18" type="text" name="ref" value="' . (GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref) . '"></td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// FK_USER_CREATE
|
// FK_USER_CREATE
|
||||||
@ -249,6 +249,7 @@ class FormTicket
|
|||||||
// If no socid, set to -1 to avoid full contacts list
|
// If no socid, set to -1 to avoid full contacts list
|
||||||
$selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
|
$selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
|
||||||
$nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
|
$nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
|
||||||
|
print ' ';
|
||||||
$formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
|
$formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
} else {
|
} else {
|
||||||
@ -293,16 +294,16 @@ class FormTicket
|
|||||||
print $this->selectTypesTickets((GETPOST('type_code') ? GETPOST('type_code') : $this->type_code), 'type_code', '', '2');
|
print $this->selectTypesTickets((GETPOST('type_code') ? GETPOST('type_code') : $this->type_code), 'type_code', '', '2');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Category
|
|
||||||
print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">' . $langs->trans("TicketCategory") . '</span></label></td><td>';
|
|
||||||
print $this->selectCategoriesTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', '', '2');
|
|
||||||
print '</td></tr>';
|
|
||||||
|
|
||||||
// Severity
|
// Severity
|
||||||
print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">' . $langs->trans("TicketSeverity") . '</span></label></td><td>';
|
print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">' . $langs->trans("TicketSeverity") . '</span></label></td><td>';
|
||||||
print $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', '2');
|
print $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', '2');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
|
// Category
|
||||||
|
print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">' . $langs->trans("TicketCategory") . '</span></label></td><td>';
|
||||||
|
print $this->selectAnalyticCodesTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', '', '2');
|
||||||
|
print '</td></tr>';
|
||||||
|
|
||||||
// Notify thirdparty at creation
|
// Notify thirdparty at creation
|
||||||
if (empty($this->ispublic))
|
if (empty($this->ispublic))
|
||||||
{
|
{
|
||||||
@ -338,7 +339,7 @@ class FormTicket
|
|||||||
}
|
}
|
||||||
include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
|
include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
|
||||||
$uselocalbrowser = true;
|
$uselocalbrowser = true;
|
||||||
$doleditor = new DolEditor('message', GETPOST('message', 'alpha'), '100%', 250, 'dolibarr_details', 'In', true, $uselocalbrowser);
|
$doleditor = new DolEditor('message', GETPOST('message', 'alpha'), '100%', 230, 'dolibarr_details', 'In', true, $uselocalbrowser);
|
||||||
$doleditor->Create();
|
$doleditor->Create();
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
@ -519,7 +520,7 @@ class FormTicket
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return html list of ticket categories
|
* Return html list of ticket anaytic codes
|
||||||
*
|
*
|
||||||
* @param string $selected Id categorie pre-selectionnée
|
* @param string $selected Id categorie pre-selectionnée
|
||||||
* @param string $htmlname Nom de la zone select
|
* @param string $htmlname Nom de la zone select
|
||||||
@ -531,7 +532,7 @@ class FormTicket
|
|||||||
* @param string $morecss More CSS
|
* @param string $morecss More CSS
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function selectCategoriesTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
|
public function selectAnalyticCodesTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
|
||||||
{
|
{
|
||||||
global $langs, $user;
|
global $langs, $user;
|
||||||
|
|
||||||
|
|||||||
@ -382,9 +382,8 @@ class SMTPs
|
|||||||
$this->getPort(), // which Port number to use
|
$this->getPort(), // which Port number to use
|
||||||
$this->errno, // actual system level error
|
$this->errno, // actual system level error
|
||||||
$this->errstr, // and any text that goes with the error
|
$this->errstr, // and any text that goes with the error
|
||||||
$this->_smtpTimeout
|
$this->_smtpTimeout // timeout for reading/writing data over the socket
|
||||||
)) // timeout for reading/writing data over the socket
|
)) {
|
||||||
{
|
|
||||||
// Fix from PHP SMTP class by 'Chris Ryan'
|
// Fix from PHP SMTP class by 'Chris Ryan'
|
||||||
// Sometimes the SMTP server takes a little longer to respond
|
// Sometimes the SMTP server takes a little longer to respond
|
||||||
// so we will give it a longer timeout for the first read
|
// so we will give it a longer timeout for the first read
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user