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
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
dvdwalker
d4d7e85805 Update modProduct.class.php 2020-10-30 08:19:28 -03: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
Laurent Destailleur
f51b02026c Fix regression 2020-10-30 04:24:06 +01:00
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
 2020-10-30 04:21:07 +01:00
Laurent Destailleur
f5a156ee06 Fix regression 2020-10-30 04:17:02 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +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
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Laurent Destailleur
f22017080d Fix for php8 2020-10-30 03:25:33 +01:00
Frédéric FRANCE
e049eb960d add trigger user create 2020-10-29 20:53:28 +01:00
Frédéric FRANCE
0507e71586 phpcs 2020-10-29 18:44:15 +01:00
Frédéric FRANCE
317ffc65c9 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-29 18:41:22 +01:00
Laurent Destailleur
8c646cdf4f Merge pull request #15207 from frederic34/patch-11 
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
 2020-10-29 17:49:16 +01:00
Laurent Destailleur
391224d221 Merge pull request #15214 from hregis/fix_date_not_recover_in_edit_mode 
FIX extrafield date not recover in create/edit mode
 2020-10-29 17:42:13 +01:00
Laurent Destailleur
45477aba0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:50 +01:00
Laurent Destailleur
c187b41714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-29 13:10:39 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
 2020-10-29 13:10:10 +01:00
Laurent Destailleur
d7225327e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-29 11:13:29 +01:00
Regis Houssin
032813fa19 FIX extrafield date not recover in create/edit mode 2020-10-29 11:05:45 +01:00
Laurent Destailleur
980cb095da Fix sort order use last sortorder if several fields. 2020-10-29 11:05:43 +01:00
Florian Mortgat
5e2962ef38 FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines on a document 2020-10-29 10:50:13 +01:00
Frédéric FRANCE
5d0ac98c34 work on zapier 2020-10-29 00:34:41 +01:00
Frédéric FRANCE
4d716e74bd Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER 2020-10-28 19:06:45 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Laurent Destailleur
f760b20bde Fix double semi colon 2020-10-28 17:48:20 +01:00
Laurent Destailleur
4cf32824bf Merge pull request #15187 from frederic34/patch-6 
Make MAIN_ALL_TO_UPPER utf8 compliant
 2020-10-28 17:17:18 +01:00
Laurent Destailleur
77dfda1a2d Merge pull request #15194 from ptibogxiv/patch-391 
FIX display variants card
 2020-10-28 17:10:34 +01:00
Laurent Destailleur
e3f848238d Merge pull request #15195 from frederic34/cachecompanylib 
add cache
 2020-10-28 17:09:27 +01:00