Commit Graph

98292 Commits

Author SHA1 Message Date
Laurent Destailleur
0d391ec185 Show name of sitemap file 2021-04-27 11:20:04 +02:00
Laurent Destailleur
4b204301a9 Enhance logs 2021-04-27 03:25:49 +02:00
Laurent Destailleur
3e013ebad0 Fix mass action delete of cron jobs 2021-04-27 03:16:11 +02:00
Laurent Destailleur
0c1f8b96ef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-27 02:55:07 +02:00
Laurent Destailleur
0a0b3f414a Fix phpcs 2021-04-27 02:54:33 +02:00
Laurent Destailleur
5bb2531364 Enhance ticket module 2021-04-27 02:52:24 +02:00
Laurent Destailleur
ea08dfff5a Package for v14 2021-04-27 02:21:02 +02:00
Laurent Destailleur
cf90bd75d0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-27 02:17:57 +02:00
Laurent Destailleur
f57b38ae59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 02:16:44 +02:00
Laurent Destailleur
ea19747bc6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b Fix phpcs 2021-04-27 02:15:58 +02:00
Laurent Destailleur
3343b9a2af Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/paiement/card.php
2021-04-27 02:12:40 +02:00
Laurent Destailleur
407ed9e40a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 02:11:36 +02:00
Laurent Destailleur
9513f25a36 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:11:11 +02:00
Laurent Destailleur
c7f38c4cf0 Fix bad var 2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7 Fix bad merge 2021-04-27 02:09:43 +02:00
Laurent Destailleur
27aa7cdb48 Fix bad merge 2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
2021-04-27 02:07:48 +02:00
Laurent Destailleur
12a4bc64ad Remove $_REQUEST 2021-04-27 02:01:46 +02:00
Laurent Destailleur
ea040a423f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-27 01:58:30 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
2021-04-27 01:58:19 +02:00
Laurent Destailleur
b3f8a6758e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:13 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
7a6edfd61f
Merge pull request #17295 from atm-gauthier/fix_adv_target_emailing_extrafields_link
FIX : type link extrafield case for advanced target emailing
2021-04-27 01:45:26 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
e026b92a99
Merge pull request #17354 from aspangaro/13p9
FIX Accountancy - Quadra export - wrong data on credit
2021-04-27 01:32:45 +02:00
Laurent Destailleur
f932da97ae
Merge pull request #17350 from dolibit-ut/patch-300
Update bom_list.php
2021-04-27 01:32:15 +02:00
Laurent Destailleur
56177da58c
Merge pull request #17349 from dolibit-ut/patch-299
Update bom_document.php
2021-04-27 01:32:05 +02:00
Laurent Destailleur
f83717b54e
Merge pull request #17348 from dolibit-ut/patch-298
Update bom_card.php
2021-04-27 01:31:54 +02:00
Laurent Destailleur
5849c01387
Merge pull request #17347 from dolibit-ut/patch-297
Update bom_agenda.php
2021-04-27 01:31:39 +02:00
Laurent Destailleur
5bd13d6daa
Merge pull request #17344 from altairis-noe/product_card_typo
product card typo
2021-04-27 01:31:11 +02:00
Laurent Destailleur
32970b78ee
Merge pull request #17359 from FHenry/13.0
fix: add some .gitignore for module builder template
2021-04-27 01:30:43 +02:00
Laurent Destailleur
890c053deb
Merge pull request #17353 from dolibit-ut/patch-301
Update llx_20_c_departements.sql
2021-04-27 01:30:17 +02:00
Laurent Destailleur
a6fda78023
Merge pull request #17364 from Robin-Yann/13-company-disable-workflow
NEW Add option SOCIETE_DISABLE_WORKFORCE to hide staff field
2021-04-27 01:29:38 +02:00
Laurent Destailleur
9579533f4f
Merge pull request #17346 from dolibit-ut/patch-296
Update element.php
2021-04-27 01:23:59 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Laurent Destailleur
efbed70286
Update card.php 2021-04-27 01:17:26 +02:00
Laurent Destailleur
539954f760 Clean code 2021-04-27 01:12:40 +02:00
Laurent Destailleur
d2b91e934a Clean code 2021-04-27 01:09:46 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
29b1f2b58a Look and feel v14 2021-04-27 00:48:39 +02:00
Laurent Destailleur
5bfedbc248 Fix regression 2021-04-27 00:20:51 +02:00
Laurent Destailleur
bbcf206336
Merge pull request #17370 from cfoellmann/fix-bookmarks
NEW Make public bookmarks editable by admin users only
2021-04-27 00:13:25 +02:00
Laurent Destailleur
fa1ad82663 Fix id in comment 2021-04-26 23:42:49 +02:00
Laurent Destailleur
566a9da56a
Merge pull request #17367 from dolibit-ut/patch-302
Update llx_10_c_regions.sql
2021-04-26 23:40:33 +02:00
Laurent Destailleur
5f4fe20756
Merge pull request #17371 from ksar-ksar/13.0
FIX #17363
2021-04-26 23:39:52 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423
NEW : Update doleditor.class.php for easily activate SCAYT
2021-04-26 23:38:23 +02:00
Laurent Destailleur
5a6d3b7c88
Merge pull request #17372 from marc-dll/FIX_11.0_invoice__generation_after_paiement
FIX: invoice PDF generation after payment
2021-04-26 22:49:56 +02:00
Laurent Destailleur
819a5bd0bd
Merge pull request #17373 from indelog/public_donationpaiement
Add : register donation payment when public payment
2021-04-26 22:46:48 +02:00
Laurent Destailleur
b96205d968
Merge pull request #17374 from Robin-Yann/13-fix-contact_filer-fournisseur
FIX List contact TAG filter fournisseur
2021-04-26 22:43:12 +02:00