Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,506 Commits 36 Branches 189 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

21986 Commits

Author SHA1 Message Date
Laurent Destailleur
12b9a73ca5 Fix phpcs 2020-08-06 02:18:34 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2020-08-06 02:15:04 +02:00
Laurent Destailleur
2fd430bd2c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:08:44 +02:00
Laurent Destailleur
ef0f7cfa6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-06 02:08:15 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
 2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165 FIX Bad address used for vendor on PDF standard of supplier payment 2020-08-06 02:05:55 +02:00
Laurent Destailleur
1cf3422e05 FIX Bad adress of vendor in PDF for PDF of supplier payment 
FIX dol_convertToWord() Bad conversion of number into a string
 2020-08-06 01:56:42 +02:00
spooky360
a94fa93973 Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr) 2020-08-05 17:11:19 +02:00
spooky360
b9513255fd Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr). 2020-08-05 17:02:59 +02:00
Laurent Destailleur
1f02b33195 Work on inventory 2020-08-05 12:25:26 +02:00
Philippe Grand
eed8957e07 Update pdf_blochet.class.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:33:52 +02:00
Philippe Grand
8d2edfc5ab Update pdf_crabe.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:13:08 +02:00
Philippe Grand
8483d4609c Update pdf_rouget.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:05:32 +02:00
Philippe Grand
7e519da8df Update pdf_merou.modules.php 
The comment should be TCPDF and not PDF
 2020-08-04 17:00:59 +02:00
Philippe Grand
e368de9bba Update pdf_ban.modules.php 2020-08-04 16:55:47 +02:00
stickler-ci
8d88217434 Fixing style errors. 2020-08-04 14:48:15 +00:00
Ferran Marcet
70ad2fcee0 Fix: User can see events that are not assigned to it 2020-08-04 16:45:57 +02:00
Ferran Marcet
7a077a2d99 Fix: User can see events that are not assigned to it 2020-08-04 16:45:04 +02:00
Ferran Marcet
1a62a36b86 Merge remote-tracking branch 'origin/10.0' into 10.0 2020-08-04 16:40:01 +02:00
Ferran Marcet
7b6ef7aca8 Merge branch '10.0up' into 10.0 2020-08-04 16:39:40 +02:00
Philippe Grand
bc86518020 Update pdf_aurore.modules.php 2020-08-04 16:13:35 +02:00
Philippe Grand
6a24aed42a Update pdf_standard.modules.php 2020-08-04 16:12:21 +02:00
Philippe Grand
c6b4c4392c Update pdf_muscadet.modules.php 2020-08-04 16:11:25 +02:00
Philippe Grand
79be00f0aa Update pdf_cornas.modules.php 2020-08-04 16:10:06 +02:00
Philippe Grand
62c49b2ce3 Update pdf_canelle.modules.php 2020-08-04 16:08:43 +02:00
Philippe Grand
49c99cfa70 Update pdf_squille.modules.php 2020-08-04 16:07:21 +02:00
Philippe Grand
4d1743ffcf Update pdf_cyan.modules.php 2020-08-04 16:06:01 +02:00
Philippe Grand
f4a4444c79 Update pdf_azur.modules.php 2020-08-04 16:04:54 +02:00
Philippe Grand
54878e2916 Update pdf_timespent.modules.php 2020-08-04 16:03:28 +02:00
Philippe Grand
d9c260c7f1 Update pdf_beluga.modules.php 2020-08-04 16:02:19 +02:00
Philippe Grand
81b484ecc8 Update pdf_baleine.modules.php 2020-08-04 16:01:28 +02:00
Philippe Grand
d781a7cf62 Update pdf_espadon.modules.php 2020-08-04 16:00:12 +02:00
Philippe Grand
e8f92fe5bc Update pdf_standard.class.php 2020-08-04 15:59:23 +02:00
Philippe Grand
6937efa3ba Update pdf_typhon.modules.php 2020-08-04 15:57:25 +02:00
Philippe Grand
ea72d5dc82 Update pdf_soleil.modules.php 2020-08-04 15:56:17 +02:00
Philippe Grand
51cbbcd3b8 Update pdf_sponge.modules.php 2020-08-04 15:55:14 +02:00
Philippe Grand
d97a9c9b0d Update pdf_crabe.modules.php 2020-08-04 15:53:20 +02:00
Philippe Grand
85879a0baa Update pdf_standard.modules.php 2020-08-04 15:51:35 +02:00
Philippe Grand
001662af3d Update pdf_rouget.modules.php 2020-08-04 15:49:47 +02:00
Philippe Grand
19fb6e827e Update pdf_merou.modules.php 2020-08-04 15:47:00 +02:00
Philippe Grand
f94d4413a9 Update pdf_espadon.modules.php 2020-08-04 15:45:52 +02:00
Philippe Grand
3fcacf7196 Update pdf_blochet.class.php 2020-08-04 15:44:25 +02:00
Philippe Grand
2627bec686 Update pdf_sepamandate.modules.php 2020-08-04 15:43:28 +02:00
Philippe Grand
6874feb09a Update pdf_ban.modules.php 2020-08-04 15:42:14 +02:00
Philippe Grand
e4faa0228e Update pdf_strato.modules.php 2020-08-04 15:40:42 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
39a5583930 FIX #14146 2020-08-04 13:32:26 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
c09827248b Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default 
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
 2020-08-04 12:27:31 +02:00