Laurent Destailleur
|
5bd538fb2c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
|
2018-09-20 23:43:34 +02:00 |
|
Laurent Destailleur
|
df395847d3
|
FIX #9567
|
2018-09-20 19:14:32 +02:00 |
|
Laurent Destailleur
|
12b449fe49
|
It's easier to select fields to show on list
|
2018-09-19 16:41:33 +02:00 |
|
Laurent Destailleur
|
4580ed0b09
|
Fix bad link
|
2018-09-18 15:31:25 +02:00 |
|
Philippe GRAND
|
18f4755a90
|
Standardize and update code
|
2018-09-14 10:20:21 +02:00 |
|
gauthier
|
b68523b9c1
|
FIX : According to french law, if seller is in France and buyer isn't in UE and isn't a company, TVA used = TVA product
|
2018-09-13 14:37:12 +02:00 |
|
Laurent Destailleur
|
b4264ee0a0
|
Use font awesome for sort image
|
2018-09-12 21:57:32 +02:00 |
|
Laurent Destailleur
|
fcabe67e4b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-12 13:30:28 +02:00 |
|
Laurent Destailleur
|
53da80a79f
|
FIX Missing translation in predefined email to membership renewal
|
2018-09-12 12:55:10 +02:00 |
|
Laurent Destailleur
|
887a40cf1d
|
Remove TODO
|
2018-09-02 16:46:01 +02:00 |
|
Laurent Destailleur
|
bcee0ef0ae
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
|
2018-09-01 14:16:57 +02:00 |
|
Laurent Destailleur
|
dee9442720
|
Fix regression
|
2018-09-01 13:12:09 +02:00 |
|
Laurent Destailleur
|
5604f3b0c3
|
Merge pull request #9376 from frederic34/functionCommentMissing
function Comment Missing
|
2018-09-01 12:59:32 +02:00 |
|
Frédéric FRANCE
|
ebcf43ec73
|
function Comment Missing
|
2018-08-31 21:39:23 +02:00 |
|
Laurent Destailleur
|
b08971b03b
|
FIX vat rate code not return by get_product_vat_for_country
|
2018-08-31 14:52:34 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
6abd5d478a
|
Update functions.lib.php
|
2018-08-23 17:15:14 +02:00 |
|
Laurent Destailleur
|
f7da76e1c0
|
Use session cache for stats
|
2018-08-16 14:24:59 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
Laurent Destailleur
|
9fc5d39d07
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:36 +02:00 |
|
Laurent Destailleur
|
dc8c4402ee
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:22 +02:00 |
|
Laurent Destailleur
|
0a1c6e7194
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
|
2018-08-12 20:08:20 +02:00 |
|
Laurent Destailleur
|
6954ab00f9
|
Update functions.lib.php
|
2018-08-12 18:11:27 +02:00 |
|
Frédéric FRANCE
|
79aaddbb66
|
test phpcs v3
|
2018-08-09 14:46:00 +02:00 |
|
ATM-Nicolas
|
70adfb135d
|
FIX : Missing behavior
|
2018-08-03 09:51:29 +02:00 |
|
ATM-Nicolas
|
b9a44fc76b
|
FIX : Wrong position of firstname lastname
|
2018-07-31 12:15:18 +02:00 |
|
Laurent Destailleur
|
dc2fec8f57
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-24 19:37:04 +02:00 |
|
Laurent Destailleur
|
d871b8964f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-07-24 19:23:40 +02:00 |
|
Laurent Destailleur
|
20f178fdfe
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
|
2018-07-24 19:22:00 +02:00 |
|
Frédéric FRANCE
|
d582f72bd9
|
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
|
2018-07-22 17:27:02 +02:00 |
|
Laurent Destailleur
|
c4e207e8b7
|
Fix dol_string_onlythesehtmltags
|
2018-07-22 15:51:19 +02:00 |
|
Laurent Destailleur
|
2c7029850a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
|
2018-07-21 20:28:26 +02:00 |
|
Laurent Destailleur
|
efa5cdeab1
|
More complete list of allowed html tags
|
2018-07-19 15:24:48 +02:00 |
|
Laurent Destailleur
|
26507ee712
|
Code comment
|
2018-07-17 14:02:08 +02:00 |
|
Laurent Destailleur
|
7fcec5f6c3
|
Fix duplicate tab "contact" on thirdparty
|
2018-07-17 13:54:13 +02:00 |
|
Laurent Destailleur
|
8249179fb8
|
Fix duplicate tab "contact" on thirdparty
|
2018-07-17 13:50:26 +02:00 |
|
Laurent Destailleur
|
d4a5491753
|
Fix duplicate tab "contact" on thirdparty
|
2018-07-17 13:48:08 +02:00 |
|
Laurent Destailleur
|
41605ed4a7
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2018-07-16 11:29:47 +02:00 |
|
Laurent Destailleur
|
d3cc2c81eb
|
Better detail for time elapsed
|
2018-07-16 11:14:39 +02:00 |
|
Laurent Destailleur
|
ba36d1aef0
|
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes
fix sql error functions.lib.php
|
2018-07-15 20:00:54 +02:00 |
|
Laurent Destailleur
|
0ca9f6f522
|
Update functions.lib.php
|
2018-07-15 20:00:43 +02:00 |
|
ias-ceo
|
076bf0a3a7
|
fix sql error
|
2018-07-12 05:09:36 +03:00 |
|
Laurent Destailleur
|
4c65f4d498
|
Log
|
2018-07-11 09:38:40 +02:00 |
|
Laurent Destailleur
|
5f52dfa873
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-07-10 14:02:40 +02:00 |
|
Laurent Destailleur
|
44626a3a48
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2018-07-10 13:57:24 +02:00 |
|
Laurent Destailleur
|
aeb5f5e4f3
|
Fix phpcs
|
2018-07-10 13:56:03 +02:00 |
|
Laurent Destailleur
|
a55abb4da7
|
Fix version
|
2018-07-10 13:54:20 +02:00 |
|
Laurent Destailleur
|
8e0a663b7c
|
Code comment
|
2018-07-10 10:53:59 +02:00 |
|
Laurent Destailleur
|
e427496ddf
|
FIX Injection
|
2018-07-09 14:13:01 +02:00 |
|
Laurent Destailleur
|
91b7ee5fc2
|
NEW Add function isValidMXRecord
|
2018-07-04 11:07:28 +02:00 |
|