Commit Graph

90848 Commits

Author SHA1 Message Date
Laurent Destailleur
f1cab5aa23 Merge pull request #15125 from frederic34/statcard
replace & by &&
2020-10-25 14:47:07 +01:00
Laurent Destailleur
a2f785e8aa Merge pull request #15126 from frederic34/patch-10
doxygen
2020-10-25 14:46:01 +01:00
Laurent Destailleur
cc17f08409 Merge pull request #15131 from frederic34/patch-13
doxygen
2020-10-25 14:45:24 +01:00
Laurent Destailleur
21d26c008a Merge pull request #15130 from bafbes/abb120351
fix:rowid is string in currencies table
2020-10-25 14:45:12 +01:00
Laurent Destailleur
335d1db3a6 Update dict.php 2020-10-25 14:43:33 +01:00
Laurent Destailleur
f31b4ee49d Merge pull request #15127 from frederic34/task_universal
fix unknown property db
2020-10-25 14:35:03 +01:00
Laurent Destailleur
c6cee2f96f Merge pull request #15128 from frederic34/patch-11
doxygen
2020-10-25 14:34:15 +01:00
Laurent Destailleur
180d01e76e Merge pull request #15132 from frederic34/patch-14
doxygen
2020-10-25 14:34:04 +01:00
Laurent Destailleur
167430137f Merge pull request #15134 from frederic34/public_ticket
add hook on public new ticket
2020-10-25 14:33:46 +01:00
Laurent Destailleur
9ccafcb651 Merge pull request #15133 from ptibogxiv/patch-390
Fix takeposlist thirdparty
2020-10-25 14:33:08 +01:00
Laurent Destailleur
bb6a71c534 Merge pull request #15135 from frederic34/loanlib
fix variable
2020-10-25 14:15:18 +01:00
Laurent Destailleur
495d8e711a Merge pull request #15137 from frederic34/patch-16
Update chargesociales.class.php
2020-10-25 14:15:06 +01:00
Laurent Destailleur
a7b23dc4f6 Update chargesociales.class.php 2020-10-25 14:14:50 +01:00
Laurent Destailleur
dfc8606114 Merge pull request #15136 from frederic34/patch-15
doxygen
2020-10-25 14:13:54 +01:00
Laurent Destailleur
13beeb0a61 Merge pull request #15138 from frederic34/patch-17
Update asset.class.php
2020-10-25 14:13:28 +01:00
Laurent Destailleur
182de28d74 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-25 14:12:51 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Laurent Destailleur
42a8f75245 Merge pull request #15145 from frederic34/2020_zappier
add zapier readme
2020-10-25 13:53:46 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
729a6aa364 hook list 2020-10-25 12:17:43 +01:00
Frédéric FRANCE
8d08157018 add zapier readme 2020-10-25 09:26:48 +01:00
Frédéric FRANCE
ec033ff101 add zapier readme 2020-10-25 09:22:51 +01:00
Frédéric FRANCE
af6629a427 Update asset.class.php 2020-10-24 14:11:28 +02:00
Frédéric FRANCE
5c1fac0f82 Update recruitmentjobposition.class.php 2020-10-24 14:02:34 +02:00
Frédéric FRANCE
f4181a77cd Update chargesociales.class.php 2020-10-24 13:53:00 +02:00
Frédéric FRANCE
9e9a5efd08 doxygen 2020-10-24 13:47:00 +02:00
Frédéric FRANCE
000fa91235 fix variable 2020-10-24 13:39:59 +02:00
Frédéric FRANCE
302fb6defa add hook on public new ticket 2020-10-24 13:17:23 +02:00
ptibogxiv
ac800473c3 Update list.php 2020-10-24 12:46:13 +02:00
ptibogxiv
14e67b6536 Fix takeposlist thirdparty
exclude only supplier thirdparties for more efficient search
2020-10-24 11:16:36 +02:00
Frédéric FRANCE
adf1cd1fb7 doxygen 2020-10-24 09:42:52 +02:00
Frédéric FRANCE
e476678a54 doxygen 2020-10-24 09:32:39 +02:00
bahfir abbes
3f03b678e9 fix:rowid is string in currencies table 2020-10-24 03:47:10 +01:00
Frédéric FRANCE
3d3b530357 doxygen 2020-10-23 22:24:20 +02:00
Frédéric FRANCE
96e80f116a fix unknown property db 2020-10-23 22:06:23 +02:00
Frédéric FRANCE
797a553609 Update paypal.lib.php 2020-10-23 22:01:23 +02:00
Frédéric FRANCE
7cfa710d48 replace & by && 2020-10-23 21:53:18 +02:00
Laurent Destailleur
ae4020c9fe Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
2020-10-23 17:38:01 +02:00
Laurent Destailleur
50da1cd95e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-23 17:33:57 +02:00
Laurent Destailleur
cf4ea4168d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/extrafields.class.php
2020-10-23 17:33:14 +02:00
Laurent Destailleur
f00fa93903 FIX check on required field when updating 1 extrafields. 2020-10-23 17:31:17 +02:00
Laurent Destailleur
377c44eeab Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required
FIX no empty value in required extrafield
2020-10-23 17:29:12 +02:00
Laurent Destailleur
cddbbc76c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-23 15:31:35 +02:00
Laurent Destailleur
572637b726 Enhance update of 1 extrafield (simple update instead of delete+insert) 2020-10-23 15:31:13 +02:00
Laurent Destailleur
58597bc8fe Merge pull request #15058 from Hystepik/develop
FIX pb of duplicate event on command
2020-10-23 14:12:42 +02:00
Laurent Destailleur
d3b024a08b Merge pull request #15115 from frederic34/patch-7
fix phpcs
2020-10-23 14:10:46 +02:00
Laurent Destailleur
8d5d7f801c Merge branch 'develop' into patch-7 2020-10-23 14:10:33 +02:00
Laurent Destailleur
7875082032 Merge pull request #15114 from frederic34/patch-6
fix phpcs
2020-10-23 14:09:08 +02:00
Laurent Destailleur
d21ad72e4a Fix phpcs 2020-10-23 13:58:19 +02:00
Laurent Destailleur
ffcf8edd19 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-23 13:55:42 +02:00