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

21961 Commits

Author SHA1 Message Date
Laurent Destailleur
41965381fd Better compatibility with PHP8 2020-11-01 21:27:56 +01:00
Frédéric FRANCE
a1016d79a2 initSpecimenCommon 2020-11-01 20:33:06 +01:00
Laurent Destailleur
ce7a96cbf1 Add more assertion 2020-11-01 20:11:09 +01:00
Laurent Destailleur
d6b6cacbe5 Removed warning 2020-11-01 20:02:12 +01:00
Laurent Destailleur
a61d317b5c Var not defined 2020-11-01 18:25:21 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Laurent Destailleur
63a03cdad6 FIX #15208 2020-11-01 14:34:29 +01:00
Frédéric FRANCE
e52b79d586 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-01 14:19:06 +01:00
Laurent Destailleur
4feed10b75 Merge pull request #15246 from hregis/develop_bug2 
FIX to avoid error with geoip
 2020-11-01 13:54:58 +01:00
Regis Houssin
e19e56e14c FIX to avoid error with geoip 2020-11-01 10:47:54 +01:00
Frédéric FRANCE
d9bf49c5dc phpcs 2020-10-31 21:04:38 +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
Laurent Destailleur
f00cdd3e04 Merge pull request #15239 from frederic34/patch-8 
fix init auguria menu
 2020-10-31 17:30:24 +01:00
Frédéric FRANCE
24cbb6db5f fix init auguria menu 2020-10-31 17:24:30 +01:00
Frédéric FRANCE
de0f115cbd Update auguria.lib.php 
The variable $classname does not seem to be defined for all execution paths leading up to this point.
 2020-10-31 16:56:43 +01:00
Frédéric FRANCE
be4a4cb54b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Laurent Destailleur
e5a5f37b3f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/bills.lang
 2020-10-31 15:09:26 +01:00
Laurent Destailleur
125b94d749 Merge pull request #15234 from frederic34/patch-8 
doxygen
 2020-10-31 15:05:41 +01:00
Laurent Destailleur
41b938047d Fix doc 2020-10-31 14:51:32 +01:00
stickler-ci
284c9bc6a8 Fixing style errors. 2020-10-31 13:34:01 +00: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
78b94c775b Update commonobject.class.php 2020-10-31 13:59:46 +01:00
Laurent Destailleur
11f9c4cfbd Merge pull request #15117 from atm-jpb/develop_editorRate 
# New multi-currency exchange rate editor
 2020-10-31 13:55:42 +01:00
Laurent Destailleur
1af3709793 Merge pull request #15232 from frederic34/patch-6 
doxygen
 2020-10-31 13:50:28 +01:00
Laurent Destailleur
2b09b7be8e Fix css 2020-10-31 13:47:50 +01:00
Frédéric FRANCE
85b3b5de36 Update commonobject.class.php 2020-10-31 13:24:09 +01:00
Frédéric FRANCE
a51d135c7b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 12:57:53 +01:00
Laurent Destailleur
9113ecedfa code comment 2020-10-31 12:55:26 +01:00
Laurent Destailleur
cea61d3b52 Fix var 2020-10-31 12:44:14 +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
fcb3245295 Fix for #15016 2020-10-31 12:11:41 +01:00
Frédéric FRANCE
0b9c866825 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 09:08:07 +01:00
Laurent Destailleur
f53483f983 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-31 04:26:23 +01:00
Laurent Destailleur
e42dee3c8e Merge pull request #15224 from frederic34/apiclean 
doxygen
 2020-10-31 04:24:53 +01:00
Laurent Destailleur
0a9c7fc577 Look and feel v13 2020-10-31 04:19:22 +01:00
Laurent Destailleur
44f532e1da Fix look and feel v13 2020-10-31 03:50:16 +01:00
Frédéric FRANCE
24ace56110 zapier on ticket create 2020-10-30 21:03:00 +01:00
Frédéric FRANCE
5afab4ba90 zapier on ticket create 2020-10-30 20:57:43 +01:00
Frédéric FRANCE
41e8f0085c zapier on ticket create 2020-10-30 20:37:23 +01:00
Laurent Destailleur
aafac6f989 Fix box of events 2020-10-30 18:58:40 +01:00
Frédéric FRANCE
8190711342 doxygen 2020-10-30 18:01:01 +01:00
Frédéric FRANCE
e4af61a587 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 08:17:53 +01:00
Laurent Destailleur
d4daf8b9ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security2.lib.php
 2020-10-30 05:59:45 +01:00
Laurent Destailleur
5504e3b236 Fix phpcs 2020-10-30 05:58:40 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
b3333da5c1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/main.inc.php
 2020-10-30 04:39:41 +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