Commit Graph

68848 Commits

Author SHA1 Message Date
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
0d91aff32c Merge pull request #9304 from atm-ph/fix_attributes_missing_for_api
Fix datec and tms missing in fetch method for API
2018-08-28 01:30:56 +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
0300991389 Fix trans 2018-08-27 23:42:47 +02:00
Laurent Destailleur
90c3f8afce Fix trans 2018-08-27 23:39:11 +02:00
Laurent Destailleur
d2154e72c0 Fix trans 2018-08-27 23:23:49 +02:00
gauthier
79aa390fe8 FIX : table llx_chargessociales doesn't exists 2018-08-27 15:07:19 +02:00
Laurent Destailleur
8cacda1c1e Fix error message 2018-08-27 14:45:20 +02:00
atm-ph
d9beb3f882 Fix tms missing in fetch propal 2018-08-27 10:19:07 +02:00
atm-quentin
ec9eeb5201 FIX check !empty exclude select element 2018-08-27 10:17:18 +02:00
atm-ph
eb4e42bc40 Fix datec and tms missing in fetch method for API 2018-08-26 18:08:10 +02:00
Frédéric FRANCE
27978ed9a0 Update productlot_list.php
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
2018-08-26 07:47:33 +02:00
Laurent Destailleur
79aa0bbd1c Fix duplicate load 2018-08-24 12:28:44 +02:00
Laurent Destailleur
a153b2f121 Fix bad link 2018-08-24 11:54:04 +02:00
Laurent Destailleur
085f8cf604 Fix bad link 2018-08-24 11:51:06 +02:00
Laurent Destailleur
89d55f3b46 Fix lib in modulebuilder 2018-08-24 11:45:22 +02:00
Laurent Destailleur
a82d86cec4 FIX warning for late template invoices to remove when suspended 2018-08-24 10:46:47 +02:00
Frédéric FRANCE
85ae8f3901 Update card.php 2018-08-24 09:29:17 +02:00
Laurent Destailleur
64427dafb6 Fix back to page when canceling an edit in the module template 2018-08-23 20:21:27 +02:00
Laurent Destailleur
781a55429a FIX API template to delete a record 2018-08-23 20:03:41 +02:00
Laurent Destailleur
499d93b8c4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/projet/class/task.class.php
	htdocs/projet/tasks/task.php
2018-08-23 19:50:58 +02:00
Laurent Destailleur
62b2981e42 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-23 19:47:31 +02:00
Laurent Destailleur
019ff534a0 FIX api template for list in module builder 2018-08-23 19:46:08 +02:00
Laurent Destailleur
8757392e6b FIX remove internal property isextrafieldmanaged from API returns 2018-08-23 19:24:00 +02:00
Laurent Destailleur
e6acacee4b Fix cleandata method of modulebuilder template of AAPI 2018-08-23 19:19:25 +02:00
Laurent Destailleur
e2e09f8534 Fix hookmanager var 2018-08-23 17:56:16 +02:00
Laurent Destailleur
61ced8220b Fix sample doc 2018-08-23 17:49:14 +02:00
Frédéric FRANCE
58d339597b Create index.html 2018-08-23 15:44:33 +02:00
Frédéric FRANCE
343e6ce8b3 typo 2018-08-23 14:34:27 +02:00
fappels
6c4ecc025e Merge remote-tracking branch 'refs/remotes/Dolibarr/8.0' into 8.0 2018-08-22 18:15:23 +02:00
Frédéric FRANCE
96f16b7497 Update commondocgenerator.class.php 2018-08-22 17:29:05 +02:00
Frédéric FRANCE
0334409d18 Update card.php 2018-08-22 13:43:30 +02:00
Laurent Destailleur
b650f7ac17 Fix tab 2018-08-22 13:37:18 +02:00
Laurent Destailleur
de2cdfc70f FIX Language selection lost if error during creation of email template 2018-08-22 13:23:46 +02:00
Laurent Destailleur
c7a241a5db FIX Get templates in a forced language
Conflicts:
	htdocs/core/class/html.formmail.class.php
2018-08-22 13:22:49 +02:00
Laurent Destailleur
c20d556265 FIX Get templates in a forced language 2018-08-22 13:16:55 +02:00
Laurent Destailleur
cd09052e80 FIX badge on time spent on project and tasks 2018-08-21 14:52:22 +02:00
Laurent Destailleur
3cfc47a732 Fix urls in project module 2018-08-21 14:41:59 +02:00
Frédéric FRANCE
b1a3238c94 Build badge for 5.0 2018-08-21 14:22:29 +02:00
Laurent Destailleur
b86d54cab3 Trad 2018-08-21 14:05:53 +02:00
Laurent Destailleur
9dbb0eaab0 Fix cron task label 2018-08-21 14:01:03 +02:00
Laurent Destailleur
243cbbc11d Fix missing trans 2018-08-21 13:58:24 +02:00
Laurent Destailleur
4fdd521d61 Merge pull request #8671 from ATM-Nicolas/fix_comments_on_tasks
FIX : Fetch task will now fetch comments
2018-08-21 13:36:20 +02:00
Laurent Destailleur
009424cd67 Merge pull request #9226 from atm-greg/Fix_project_delete_tasks
Fix project delete tasks
2018-08-21 13:11:00 +02:00
Laurent Destailleur
91bfa4be6c Update project.class.php 2018-08-21 13:10:20 +02:00