Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

6320 Commits

Author SHA1 Message Date
Laurent Destailleur
41b938047d Fix doc 2020-10-31 14:51:32 +01:00
Laurent Destailleur
9113ecedfa code comment 2020-10-31 12:55:26 +01:00
Laurent Destailleur
623cb54480 Prepare a more complete fix for #15016 2020-10-31 12:30:47 +01:00
Laurent Destailleur
a4d2927f82 Fix for #15016 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-10-31 12:18:54 +01:00
Laurent Destailleur
1a02504792 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/security2.lib.php
 2020-10-30 04:26:09 +01:00
Laurent Destailleur
f51b02026c Fix regression 2020-10-30 04:24:06 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
f22017080d Fix for php8 2020-10-30 03:25:33 +01:00
Alfredo Altamirano
214cd2c99b Update references of MO translation string 2020-10-26 15:44:26 -06:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Laurent Destailleur
31f1ab73b1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-22 17:31:29 +02:00
Florian Mortgat
529dfb8dfb FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched 2020-10-20 16:37:15 +02:00
Laurent Destailleur
6bba249935 FIX pdf_getlinetotalwithtax must show total incl tax 2020-10-16 15:50:51 +02:00
Laurent Destailleur
6933b7ec9c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-06 13:13:31 +02:00
ptibogxiv
dd1904c521 Fix multicompany in last action box 2020-10-04 13:58:46 +02:00
Laurent Destailleur
29414251f5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2020-09-29 13:19:03 +02:00
Laurent Destailleur
5c9ad3ec9b Update files.lib.php 2020-09-27 18:55:09 +02:00
Florian HENRY
5ff7e37696 review code 2020-09-27 18:05:19 +02:00
Florian HENRY
b6b2553501 Merge branch '11.0' into 11.0_fixmultidiroutput 2020-09-27 18:02:22 +02:00
Laurent Destailleur
438e884c01 Fix phpcs 2020-09-21 14:17:05 +02:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level) 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-09-21 12:22:57 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:46:23 +02:00
Alexandre SPANGARO
bc457ebb66 Stickler 2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913 FIX Yogosha report 4425 (backport) 2020-09-16 20:55:28 +02:00
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
Laurent Destailleur
0cccaa7271 FIX look and feel v12 2020-09-10 18:02:49 +02:00
Laurent Destailleur
5c34b26f39 FIX Look and feel v12: First tab must be name of object 2020-09-09 13:57:35 +02:00
Laurent Destailleur
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +02:00
Laurent Destailleur
8115acbf82 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:05 +02:00
Laurent Destailleur
f819509442 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a Fix include regression 2020-08-23 19:22:01 +02:00
Laurent Destailleur
38d53cc03d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-08-23 19:20:50 +02:00
Laurent Destailleur
4fa6d86127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:01 +02:00
Laurent Destailleur
7a183ea026 Update pdf.lib.php 2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9 Update pdf.lib.php 2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684 Update pdf.lib.php 2020-08-23 19:11:19 +02:00
Laurent Destailleur
d4a502629e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/stock.php
	htdocs/core/lib/ajax.lib.php
 2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d FIX Setup of stock increase/decrease 2020-08-18 15:27:17 +02:00
Laurent Destailleur
c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
 2020-08-17 19:54:23 +02:00
John Botella
6e1702c1a5 Fix infinite fetch object linked loop 2020-08-17 15:00:31 +02:00
Laurent Destailleur
86a31d17a5 Better test 2020-08-17 04:34:53 +02:00
asolslk
5a6f459db5 Update accounting.lib.php 2020-08-17 04:09:12 +02:00
Laurent Destailleur
65ceaac42e Better message 2020-08-14 12:56:17 +02:00
Laurent Destailleur
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +02:00