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
|
2cdbfa2048
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-11-01 17:45:22 +01:00 |
|
Laurent Destailleur
|
72160deef7
|
FIX #14979
|
2020-11-01 17:01:26 +01:00 |
|
Laurent Destailleur
|
ad922bfde6
|
FIX #15074
|
2020-11-01 16:08:09 +01:00 |
|
Laurent Destailleur
|
49ccf2a3cb
|
Update doc
|
2020-11-01 15:55:51 +01:00 |
|
Laurent Destailleur
|
45f834cb15
|
FIX #15199
|
2020-11-01 15:20:33 +01:00 |
|
Laurent Destailleur
|
63a03cdad6
|
FIX #15208
|
2020-11-01 14:34:29 +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 |
|
Laurent Destailleur
|
4f09b87ec5
|
Merge pull request #15245 from frederic34/patch-10
fix vcard birthday of member
|
2020-11-01 13:53:14 +01:00 |
|
Laurent Destailleur
|
47a4d2c9f6
|
Merge pull request #15244 from frederic34/patch-8
doxygen
|
2020-11-01 13:52:15 +01:00 |
|
Laurent Destailleur
|
317e881e0f
|
Merge pull request #15243 from frederic34/patch-6
doxygen
|
2020-11-01 13:52:04 +01:00 |
|
Laurent Destailleur
|
3d53239da3
|
Merge pull request #15242 from frederic34/phpcs
phpcs
|
2020-11-01 13:51:22 +01:00 |
|
Regis Houssin
|
e19e56e14c
|
FIX to avoid error with geoip
|
2020-11-01 10:47:54 +01:00 |
|
Frédéric FRANCE
|
7b8c05250f
|
fix vcard birthday of member
|
2020-11-01 09:13:02 +01:00 |
|
Frédéric FRANCE
|
26406b0f9f
|
Update adherent.class.php
|
2020-11-01 08:56:56 +01:00 |
|
Frédéric FRANCE
|
c2781d5551
|
doxygen
|
2020-11-01 08:54:12 +01:00 |
|
Frédéric FRANCE
|
07432779d9
|
doxygen
|
2020-11-01 08:48:53 +01:00 |
|
Frédéric FRANCE
|
d9bf49c5dc
|
phpcs
|
2020-10-31 21:04:38 +01:00 |
|
Laurent Destailleur
|
64aef2a73f
|
Merge pull request #15240 from frederic34/patch-6
Update card.php
|
2020-10-31 18:58:24 +01:00 |
|
Frédéric FRANCE
|
e9a9e9bbc2
|
Update edit.php
|
2020-10-31 18:55:24 +01:00 |
|
Laurent Destailleur
|
64cfe6a9de
|
Merge pull request #15241 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
|
2020-10-31 18:52:05 +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 |
|
Frédéric FRANCE
|
b7271bd0d9
|
Update card.php
|
2020-10-31 18:51:20 +01:00 |
|
Laurent Destailleur
|
fb107c3195
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-31 18:45:25 +01:00 |
|
Laurent Destailleur
|
7e835c4eda
|
Set country to unkown in ping if not defined
|
2020-10-31 18:45:12 +01:00 |
|
Laurent Destailleur
|
939f5ce095
|
Fix escaping of data on ping
|
2020-10-31 18:44:28 +01:00 |
|
Laurent Destailleur
|
f00cdd3e04
|
Merge pull request #15239 from frederic34/patch-8
fix init auguria menu
|
2020-10-31 17:30:24 +01:00 |
|
Laurent Destailleur
|
950f779777
|
Merge pull request #15238 from frederic34/patch-6
Update auguria.lib.php
|
2020-10-31 17:29:36 +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 |
|
Laurent Destailleur
|
25aa301bc7
|
Merge pull request #15237 from frederic34/patch-10
remove deprecated
|
2020-10-31 16:54:39 +01:00 |
|
Laurent Destailleur
|
a27fc22728
|
Fix phpunit
|
2020-10-31 16:53:40 +01:00 |
|
Laurent Destailleur
|
fce9fea099
|
Fix params
|
2020-10-31 15:13:03 +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
|
522a3f9919
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-10-31 15:06:11 +01:00 |
|
Laurent Destailleur
|
b7dde7599b
|
More complete scrutinizer file
|
2020-10-31 15:06:00 +01:00 |
|
Laurent Destailleur
|
125b94d749
|
Merge pull request #15234 from frederic34/patch-8
doxygen
|
2020-10-31 15:05:41 +01:00 |
|
Laurent Destailleur
|
bb4bde4d5b
|
Merge pull request #15233 from frederic34/patch-6
doxygen
|
2020-10-31 15:02:32 +01:00 |
|
Laurent Destailleur
|
fcdd1b4169
|
Merge pull request #15236 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
|
2020-10-31 15:01:59 +01:00 |
|
Laurent Destailleur
|
ce59e8e35b
|
Fix phpcs
|
2020-10-31 14:58:13 +01:00 |
|
Laurent Destailleur
|
41b938047d
|
Fix doc
|
2020-10-31 14:51:32 +01:00 |
|
Frédéric FRANCE
|
8e82f0d5b9
|
remove deprecated
|
2020-10-31 14:42:47 +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 |
|
Laurent Destailleur
|
92bdcd017d
|
Fix
|
2020-10-31 14:26:11 +01:00 |
|
Laurent Destailleur
|
5ab90eeb16
|
Update doc
|
2020-10-31 14:25:03 +01:00 |
|
Laurent Destailleur
|
80efdcf260
|
Debug multicurrency editor
|
2020-10-31 14:24:00 +01:00 |
|
Frédéric FRANCE
|
78b94c775b
|
Update commonobject.class.php
|
2020-10-31 13:59:46 +01:00 |
|
Frédéric FRANCE
|
ffb8c91dc4
|
doxygen
|
2020-10-31 13:58:07 +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 |
|