Frédéric FRANCE
|
cbdc669ba9
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-29 18:45:36 +02:00 |
|
Laurent Destailleur
|
86d8513138
|
Merge pull request #9309 from frederic34/trimtrailing2
last trimtrailing
|
2018-08-29 17:57:05 +02:00 |
|
Laurent Destailleur
|
8fc289b7bb
|
Merge pull request #9324 from ptibogxiv/patch-43
Fix multicompany in ticket/list.php
|
2018-08-29 17:53:28 +02:00 |
|
Laurent Destailleur
|
2daa5b3ae0
|
Fix phpcs
|
2018-08-29 17:09:58 +02:00 |
|
Laurent Destailleur
|
98356c6ed0
|
Fix date_start and date_end not saved on supplier invoice
|
2018-08-29 17:03:18 +02:00 |
|
Frédéric FRANCE
|
0e512cbc36
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
|
2018-08-29 15:47:55 +02:00 |
|
Laurent Destailleur
|
ee204e2e64
|
Fix regression in php style
|
2018-08-29 15:37:35 +02:00 |
|
Frédéric FRANCE
|
7b2bfb28c2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
|
2018-08-29 12:48:12 +02:00 |
|
ptibogxiv
|
5f94bffa25
|
Fix multicompany in ticket/list.php
|
2018-08-29 12:26:31 +02:00 |
|
Laurent Destailleur
|
b648a28893
|
Fix regression
|
2018-08-29 11:57:43 +02:00 |
|
Laurent Destailleur
|
0eb4f8bb96
|
NEW Can set the datestart and dateend of cron job into module descriptor
|
2018-08-29 11:47:20 +02:00 |
|
Frédéric FRANCE
|
846778657f
|
fix syntax error
|
2018-08-29 11:44:26 +02:00 |
|
Laurent Destailleur
|
fde9c94b1c
|
Fix regression in media editor in websites
|
2018-08-28 14:21:58 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Frédéric FRANCE
|
1182f29864
|
trimtrailing
|
2018-08-28 08:33:02 +02:00 |
|
Laurent Destailleur
|
50d50c2e10
|
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info
NEW On customer/supplier card, add simple tooltip to amount boxes
|
2018-08-28 02:48:05 +02:00 |
|
Laurent Destailleur
|
45e30271b3
|
Merge
|
2018-08-28 02:37:06 +02:00 |
|
Laurent Destailleur
|
9c6ce4b29d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-28 02:36:15 +02:00 |
|
Laurent Destailleur
|
9a14611d55
|
Merge pull request #8996 from grandoc/new_branch_20_06_2018
clean and update code
|
2018-08-28 02:35:59 +02:00 |
|
Laurent Destailleur
|
2db84a679e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
|
2018-08-28 02:35:45 +02:00 |
|
Laurent Destailleur
|
7219bac0b2
|
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
|
2018-08-28 02:30:02 +02:00 |
|
Laurent Destailleur
|
2306f8a7c2
|
Merge pull request #9265 from grandoc/new_branch_18_08_2018
Typo
|
2018-08-28 02:25:24 +02:00 |
|
Laurent Destailleur
|
0a7ce338f9
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/commondocgenerator.class.php
|
2018-08-28 02:23:34 +02:00 |
|
Laurent Destailleur
|
1842a4bb41
|
Merge pull request #9278 from grandoc/new_branch_21_08_2018
Update and standardize code
|
2018-08-28 02:13:28 +02:00 |
|
Laurent Destailleur
|
4369be7b39
|
Merge pull request #9284 from frederic34/patch-20
Update commondocgenerator.class.php
|
2018-08-28 02:11:50 +02:00 |
|
Laurent Destailleur
|
d725c5db1e
|
Merge pull request #9303 from jtraulle/develop
NEW REST API improvements
|
2018-08-28 02:09:42 +02:00 |
|
Laurent Destailleur
|
998dca9b9f
|
Update api_thirdparties.class.php
|
2018-08-28 02:05:37 +02:00 |
|
Laurent Destailleur
|
d90eed3098
|
Merge pull request #9291 from frederic34/patch-23
typo
|
2018-08-28 01:55:44 +02:00 |
|
Laurent Destailleur
|
f8811f1b6d
|
Merge pull request #9275 from frederic34/patch-18
align parameters
|
2018-08-28 01:44:55 +02:00 |
|
Laurent Destailleur
|
0d138b8fc0
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-28 01:43:35 +02:00 |
|
Laurent Destailleur
|
6f427cbed3
|
Merge pull request #9293 from frederic34/patch-25
NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars
|
2018-08-28 01:42:35 +02:00 |
|
Laurent Destailleur
|
5185d32cc9
|
Merge pull request #9286 from frederic34/patch-22
Update propal.lib.php
|
2018-08-28 01:40:58 +02:00 |
|
Laurent Destailleur
|
fc897a8b99
|
Merge pull request #9285 from frederic34/patch-21
Update actions_ticket.class.php
|
2018-08-28 01:40:33 +02:00 |
|
Laurent Destailleur
|
14dc748523
|
Update actions_ticket.class.php
|
2018-08-28 01:40:27 +02:00 |
|
Laurent Destailleur
|
b4652ea24b
|
Merge pull request #9292 from frederic34/patch-24
Create index.html
|
2018-08-28 01:37:48 +02:00 |
|
Laurent Destailleur
|
1f807b9216
|
Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges
FIX : table llx_chargessociales doesn't exists
|
2018-08-28 01:37:31 +02:00 |
|
Laurent Destailleur
|
ad0cc098ee
|
Fix alter forgot
|
2018-08-28 01:37:25 +02:00 |
|
Laurent Destailleur
|
534eadb7a2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-28 01:35:43 +02:00 |
|
ptibogxiv
|
6556ace2bc
|
Fix sync user->member
add more fields
|
2018-08-28 01:35:05 +02:00 |
|
ptibogxiv
|
ca8a22a3ad
|
fix sync user/member
add more fields to sync
|
2018-08-28 01:35:01 +02:00 |
|
Frédéric FRANCE
|
faa29f9ae0
|
Update antivir.class.php
|
2018-08-28 01:34:42 +02:00 |
|
Norbert Penel
|
f9c1dd8edd
|
There is a begin transaction without rollback
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
|
2018-08-28 01:32:55 +02:00 |
|
Laurent Destailleur
|
aadc278fb4
|
Merge pull request #9294 from homer8173/patch-3
FIX There is a begin transaction without rollback
|
2018-08-28 01:32:21 +02:00 |
|
Laurent Destailleur
|
751fc512af
|
Merge pull request #9301 from frederic34/patch-26
FIX sql error
|
2018-08-28 01:30:25 +02:00 |
|
Laurent Destailleur
|
e00d6eda7e
|
Update productlot_list.php
|
2018-08-28 01:29:33 +02:00 |
|
Laurent Destailleur
|
004b352e8e
|
Merge pull request #9279 from frederic34/patch-11
FIX Error message when sending a file with .virus extension
|
2018-08-28 01:26:04 +02:00 |
|
Laurent Destailleur
|
61254dd5c6
|
Merge pull request #9288 from ptibogxiv/patch-39
FIX sync user->member
|
2018-08-28 01:21:51 +02:00 |
|
Laurent Destailleur
|
3032ba4acf
|
Merge pull request #9287 from ptibogxiv/patch-38
FIX sync member->user
|
2018-08-28 01:21:23 +02:00 |
|
Laurent Destailleur
|
0300991389
|
Fix trans
|
2018-08-27 23:42:47 +02:00 |
|
Laurent Destailleur
|
90c3f8afce
|
Fix trans
|
2018-08-27 23:39:11 +02:00 |
|