Commit Graph

80011 Commits

Author SHA1 Message Date
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b
Update html.form.class.php 2020-10-25 14:55:52 +01:00
Laurent Destailleur
36854b0af4
Merge pull request #15123 from frederic34/patch-8
fix unknown function
2020-10-25 14:51:42 +01:00
Laurent Destailleur
80bbec7aeb
Merge pull request #15122 from frederic34/publicmember
add hook on public new member card
2020-10-25 14:51:14 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6
Update commonobject.class.php
2020-10-25 14:50:56 +01:00
Laurent Destailleur
7a85f5a9ab
Merge pull request #15118 from hregis/develop_bug2
FIX avoid warning
2020-10-25 14:49:06 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
retrieve the spelling
2020-10-25 14:48:51 +01:00
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
Laurent De Coninck
1d62834b2c
use the second version for default bank account 2020-10-24 17:15:48 +02: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
8e77ac4eb0
fix empty array 2020-10-24 13:28:38 +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
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
345015ece2
fix unknown function 2020-10-23 19:54:45 +02:00
Frédéric FRANCE
76a0eba1a0
add hook on public new member card 2020-10-23 18:49:06 +02:00
Frédéric FRANCE
c3863aeed8
Update commonobject.class.php 2020-10-23 18:18:01 +02:00