Commit Graph

518 Commits

Author SHA1 Message Date
lmarcouiller
8c7764ed5d Move of 2 graph in boxes 2021-03-08 12:18:55 +01:00
lmarcouiller
f627637490 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-03-08 10:15:00 +01:00
Laurent Destailleur
13d0398bd2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/price.php
2021-03-07 19:07:18 +01:00
Frédéric FRANCE
7e5330496b
fis tyo 2021-03-05 22:50:28 +01:00
lmarcouiller
7ab1e0d9a0 Fix #15917 : Improvement to ticket module 2021-03-05 14:28:23 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
Laurent Destailleur
6e61ae8e56 Fix responsive 2021-03-01 19:50:35 +01:00
Juanjo Menent
96eb7a341a FIX: Bad project filter in ticket list 2021-03-01 16:14:38 +01:00
Laurent Destailleur
4c7d78ffaa Look and feel v14 2021-02-27 03:06:21 +01:00
Frédéric FRANCE
4c1004ea5d
code syntax ticket directory 2021-02-26 13:27:00 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Juanjo Menent
badd46e289 FIX: Bad project filter in ticket list 2021-02-26 11:53:23 +01:00
Juanjo Menent
e08bfab537 FIX: Bad project filter in ticket list 2021-02-25 16:29:26 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
c5bbaffb50 Fix look and feel v13 2021-01-23 19:50:04 +01:00
Laurent Destailleur
7982cab526 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
	htdocs/ticket/card.php
2021-01-21 18:34:55 +01:00
BlackMirror
a55d23f363 [FM] FIX - ticket extrafields of type 'date' are not saved 2021-01-21 15:55:52 +01:00
Laurent Destailleur
2c0f6d2984 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/ticket/list.php
2021-01-15 19:49:25 +01:00
Florian Mortgat
d3cbcedce3 FIX 12.0 (ticket) - the "openall" filter on the ticket list does not include tickets with status READ 2021-01-15 09:55:42 +01:00
Laurent Destailleur
5c104e344c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/ticket/list.php
2021-01-04 12:17:59 +01:00
Juanjo Menent
d892d8c3c7 FIX: Bad dates filtering in the ticket list causes sql error 2021-01-04 10:59:45 +01:00
Laurent Destailleur
361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/card.php
	htdocs/margin/tabs/thirdpartyMargins.php
	htdocs/societe/card.php
	htdocs/societe/note.php
	htdocs/societe/notify/card.php
	htdocs/societe/societecontact.php
	htdocs/ticket/list.php
2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703 FIX Check of customer/vendor code fails in some cases 2020-12-20 13:54:02 +01:00
Laurent Destailleur
075181a8d5 Look and feel v13 2020-12-17 12:25:50 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Laurent Destailleur
5681aeee0f Fix look and feel v13 2020-12-16 19:05:27 +01:00
Laurent Destailleur
dd54d28dc6 Debug v13 2020-12-03 10:13:13 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
cbe9fec51d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/ticket/list.php
2020-11-15 17:29:19 +01:00
Laurent Destailleur
30681f9179 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 17:15:56 +01:00
Maxime Kohlhaas
44c5988853 Fix #15377 ticket list filter on author 2020-11-15 10:42:15 +01:00
Aurélien
47fe1b4fd1
Fix ticket/index.php Warning: mysqli_result::free_result(): Couldn't fetch mysqli_result in /var/www/html/core/db/mysqli.class.php on line 390 2020-11-13 00:25:12 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
lvessiller
4ddff7173f NEW include tpl for loading lang file for extra fields in list 2020-11-06 12:19:45 +01:00
Frédéric FRANCE
59e78e6a9f
doxygen 2020-11-05 08:38:54 +01:00
Frédéric FRANCE
6e7448a1d0
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-04 19:00:10 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Frédéric FRANCE
49390a596c
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Frédéric FRANCE
be4a4cb54b
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
0b9c866825
Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 09:08:07 +01:00
Frédéric FRANCE
41e8f0085c
zapier on ticket create 2020-10-30 20:37:23 +01:00
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
f7de9333bb Doxygen 2020-10-27 19:29:42 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
10ff359889
set unknow variables 2020-10-25 22:39:12 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
27282d7e3d FIX Include the ticket and mo table in merge process of thirdparty 2020-10-16 17:08:23 +02:00
Laurent Destailleur
e74b833d7f Look and feel v13 2020-10-16 15:40:52 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
tests.
2020-10-15 19:36:08 +02:00
Hans
57acfb738f
Update card.php 2020-10-07 16:48:50 +02:00
Hans
f6f164893e
Update ticket.class.php 2020-10-07 16:45:06 +02:00
Laurent Destailleur
954a6b5b3b CSS 2020-10-02 14:26:16 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
lvessiller
7eaf26b09e NEW add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header in email collector 2020-09-28 10:14:10 +02:00
Laurent Destailleur
d9e7cacc84 Fix search 2020-09-25 14:16:59 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
2eb46b4900 Enhance antiXSS by excluding non printable chars used to obfuscate hack 2020-09-20 04:56:45 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
b6c6473cce Fix sql injection when forging requests with IN 2020-09-18 17:47:40 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad Add function to all list that support $socid 2020-09-18 10:36:40 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
cc37f4b29c Clean code. <input name="token" value="$_SESSION['newtoken']" is now
forbidden by CI. You must use newToken().
2020-09-14 16:24:02 +02:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
lvessiller
0c5bf5012e NEW Ticket title 2020-09-09 12:09:17 +02:00
lvessiller
be2fa82396 FIX stickler error comma in argument list 2020-09-09 11:54:50 +02:00
lvessiller
059624e936 NEW edit and update a ticket 2020-09-09 11:46:56 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Laurent Destailleur
f5eb8b0108 Look and feel v13 2020-09-08 04:21:35 +02:00
Laurent Destailleur
1a67b4efeb Debug 2020-09-08 02:11:09 +02:00
Laurent Destailleur
c91338198d Add some fields in candidature
Look and feel v13
2020-09-08 01:53:37 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
d700649fb9 The deprecated subsitution key __SIGNATURE__ has been removed. Replace
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
2020-09-06 19:25:25 +02:00
Laurent Destailleur
ca29cc0c77
Merge pull request #14632 from OPEN-DSI/new-ticket-type-severity-group-translated-labels
NEW translate classification labels in ticket
2020-09-04 22:39:12 +02:00
Laurent Destailleur
6eb1be02ad
Merge pull request #14630 from OPEN-DSI/new-ticket-card-extrafields-errors
NEW manage errors on update extra fields in ticket card
2020-09-04 12:27:25 +02:00
Laurent Destailleur
07fc85c222 Fix minor 2020-09-04 12:25:16 +02:00
lvessiller
85575fd604 NEW translate classification labels in ticket 2020-09-04 12:18:32 +02:00
lvessiller
eb83941e61 NEW manage errors on update extra fields in ticket card 2020-09-04 10:46:05 +02:00
lvessiller
a4f1ddaad0 NEW send context and remove new lines on create ticket 2020-09-03 17:22:27 +02:00
lvessiller
27c754e6c8 NEW add send context for ticket 2020-09-02 15:33:18 +02:00