Laurent Destailleur
|
3b245f1b30
|
Merge pull request #9247 from frederic34/missingReturn
return comment
|
2018-08-16 00:35:39 +02:00 |
|
Laurent Destailleur
|
55bfe4e821
|
Merge pull request #9245 from grandoc/new_branch_14_08_2018
Standardize code
|
2018-08-16 00:33:33 +02:00 |
|
Laurent Destailleur
|
e88b68f131
|
Merge pull request #9246 from atm-florian/6.0
fix : ODT project substitution
|
2018-08-16 00:33:04 +02:00 |
|
Laurent Destailleur
|
2a69fa39d6
|
error message
|
2018-08-16 00:18:08 +02:00 |
|
Laurent Destailleur
|
4610b193bb
|
Add error message
|
2018-08-16 00:13:13 +02:00 |
|
Laurent Destailleur
|
ae9867eead
|
Work on website import
|
2018-08-16 00:03:19 +02:00 |
|
Frédéric FRANCE
|
69a7af88e7
|
function declaration
|
2018-08-15 18:14:02 +02:00 |
|
Frédéric FRANCE
|
54a078149a
|
function declaration
|
2018-08-15 17:34:35 +02:00 |
|
Laurent Destailleur
|
7d6e25789c
|
Fix popup customer
|
2018-08-15 15:07:23 +02:00 |
|
Laurent Destailleur
|
15144a2473
|
Prepare 8.0.1
|
2018-08-15 14:42:34 +02:00 |
|
Laurent Destailleur
|
5a1a6ac095
|
Fix error message
|
2018-08-15 14:42:03 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Laurent Destailleur
|
ec56ad752c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-08-15 14:26:38 +02:00 |
|
Laurent Destailleur
|
b88c657a4a
|
Work on website import
|
2018-08-15 14:24:33 +02:00 |
|
Philippe GRAND
|
57f51fda3e
|
Standardize
|
2018-08-15 12:48:13 +02:00 |
|
Laurent Destailleur
|
37ca3ff230
|
Fix separator
|
2018-08-14 20:51:24 +02:00 |
|
Frédéric FRANCE
|
2bb4c30aac
|
remove superfluous space
|
2018-08-14 15:59:15 +02:00 |
|
Frédéric FRANCE
|
c0478cb42f
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-14 15:54:40 +02:00 |
|
Frédéric FRANCE
|
5146ab9177
|
trim
|
2018-08-14 15:34:44 +02:00 |
|
Frédéric FRANCE
|
d25fa61998
|
return comment
|
2018-08-14 13:14:55 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
florian HENRY
|
20309665e6
|
fix : ODT project substitution
|
2018-08-14 10:45:08 +02:00 |
|
Frédéric FRANCE
|
3210181a3d
|
rule for private function is different
|
2018-08-14 10:21:34 +02:00 |
|
Philippe GRAND
|
e35da2f84d
|
Standardize code
|
2018-08-14 09:55:58 +02:00 |
|
atm-greg
|
ba6f7d4b0a
|
fix infinite loop
|
2018-08-14 09:32:43 +02:00 |
|
Frédéric FRANCE
|
d30874750f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-14 09:02:12 +02:00 |
|
Laurent Destailleur
|
7c6f41e04f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-13 23:58:18 +02:00 |
|
Laurent Destailleur
|
fa4a12be41
|
Merge pull request #9208 from ptibogxiv/patch-33
fix connect mode for v8 release
|
2018-08-13 23:56:42 +02:00 |
|
Laurent Destailleur
|
848fcc4b17
|
Update actions_setnotes.inc.php
|
2018-08-13 23:53:48 +02:00 |
|
Laurent Destailleur
|
f382d8f0bb
|
Update actions_setnotes.inc.php
|
2018-08-13 23:52:33 +02:00 |
|
Laurent Destailleur
|
b98ee516d0
|
Merge pull request #9235 from grandoc/new_branch_13_08_2018
standardize code
|
2018-08-13 23:47:00 +02:00 |
|
Laurent Destailleur
|
b4a4ab4fa0
|
Merge pull request #9233 from grandoc/new_branch_12_08_2018
standardize code
|
2018-08-13 23:46:37 +02:00 |
|
Laurent Destailleur
|
3039e0e5ef
|
Merge pull request #9237 from CelineDesign/develop
NEW #9236 Allow to import expedtion lines via API
|
2018-08-13 23:44:26 +02:00 |
|
delcroix Patrick
|
3b9266060c
|
Fix #9205 quote in Label/number on supplier payment
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
|
2018-08-13 23:42:18 +02:00 |
|
Laurent Destailleur
|
e325da9339
|
Merge pull request #9244 from delcroip/patch-16
Fix #9205 quote in Label/number on supplier payment
|
2018-08-13 23:41:02 +02:00 |
|
Laurent Destailleur
|
549462574e
|
Merge pull request #9241 from frederic34/patch-11
Update modules_holiday.php
|
2018-08-13 23:40:05 +02:00 |
|
Laurent Destailleur
|
577d2d728c
|
Merge pull request #9238 from ptibogxiv/patch-35
Fix dolibarr_set_const
|
2018-08-13 23:39:42 +02:00 |
|
Laurent Destailleur
|
a866f94716
|
Fix package
|
2018-08-13 23:25:27 +02:00 |
|
Laurent Destailleur
|
5e762fe712
|
Fix cloning website switch on new web site
|
2018-08-13 23:22:20 +02:00 |
|
Laurent Destailleur
|
0ae03e78e9
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-13 23:05:46 +02:00 |
|
Laurent Destailleur
|
2cbbb6e622
|
Prepare 8.0.0 release
|
2018-08-13 23:04:58 +02:00 |
|
Laurent Destailleur
|
49ab48452a
|
Prepare 8.0.0 release
|
2018-08-13 23:00:18 +02:00 |
|
delcroix Patrick
|
cbdd1949df
|
Fix #9205 quote in Label/number on supplier payment
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
|
2018-08-13 20:39:20 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Frédéric FRANCE
|
0b5a87a443
|
Update modules_holiday.php
|
2018-08-13 17:25:41 +02:00 |
|
Laurent Destailleur
|
33f0172603
|
Fix select zip/town
|
2018-08-13 16:44:49 +02:00 |
|
Laurent Destailleur
|
f96dd391fa
|
Fix error in foreign key pointing to old table
|
2018-08-13 16:11:23 +02:00 |
|
Laurent Destailleur
|
df57bd176b
|
Fix translation
|
2018-08-13 14:53:04 +02:00 |
|
ptibogxiv
|
d0666a9583
|
Fix incorrect entity
|
2018-08-13 14:34:54 +02:00 |
|
Laurent Destailleur
|
b977c3a9f5
|
Fix translation
|
2018-08-13 14:04:10 +02:00 |
|