lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
62,302 Commits 43 Branches 150 Tags 886 MiB
5b6ca68760
Commit Graph

62302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5b6ca68760 Merge pull request #7600 from ruistrecht-alt/Fix_STATUS_ACCEPTED_in_commande 
Fix STATUS_ACCEPTED in commande
 2017-10-11 11:33:28 +02:00
Laurent Destailleur
e644f7df58 Merge pull request #7597 from hregis/develop_member 
NEW add company alias name when create company from member
 2017-10-11 11:31:55 +02:00
Laurent Destailleur
eb75c2f98e Merge pull request #7596 from hregis/develop_bug2 
Fix: wrong POST GET name
 2017-10-11 11:30:36 +02:00
Laurent Destailleur
d404d8be9f Debug to make MAIN_ODT_AS_PDF workign with unoconv 2017-10-10 18:54:30 +02:00
Laurent Destailleur
f93ecc1584 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/projet/activity/perweek.php
	htdocs/projet/element.php
 2017-10-10 11:24:17 +02:00
Laurent Destailleur
0b7aa20464 Add link to ChangeLog 2017-10-09 22:52:26 +02:00
Laurent Destailleur
3b6f6c4027 Translation 2017-10-09 19:51:42 +02:00
Laurent Destailleur
dd69f76212 Move translation key 2017-10-09 19:21:25 +02:00
Rui Strecht
666e62b440 Fixed issue with inexistent constant in commande STATUS_ACCEPTED 2017-10-09 17:54:15 +01:00
Laurent Destailleur
dce71d6e7d Fix loose filter 2017-10-09 18:51:33 +02:00
Rui Strecht
e1fa96cc6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-09 17:19:31 +01:00
Laurent Destailleur
9427655dd0 Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default 2017-10-09 18:18:34 +02:00
Laurent Destailleur
4de1ade605 Fix mix collation 2017-10-09 18:15:10 +02:00
Regis Houssin
dcf497f332 Fix: add $confirm value inside doAction hook parameters 2017-10-09 17:55:14 +02:00
Laurent Destailleur
15911a9b64 Fix illegal mix collation 2017-10-09 17:45:08 +02:00
Laurent Destailleur
19de053054 Fix itf8 mix collation 2017-10-09 17:43:57 +02:00
Regis Houssin
2bd66290a3 Fix: for avoid scroll bar 2017-10-09 16:58:17 +02:00
Regis Houssin
625e440653 Fix: wrong test 2017-10-09 16:50:20 +02:00
Laurent Destailleur
4e34c13e49 Debug 2017-10-09 16:49:17 +02:00
Regis Houssin
e2206d9bf2 Fix: uniformize substitution tags 2017-10-09 16:33:22 +02:00
Laurent Destailleur
aa07db2f38 NEW A module can change order of element in the quick search combo 2017-10-09 16:17:55 +02:00
Regis Houssin
86c301f197 Fix: uniformize parameters 2017-10-09 15:49:10 +02:00
Regis Houssin
16b766182c NEW view company name if different of fullname in dol_banner 2017-10-09 15:35:08 +02:00
Laurent Destailleur
084dc7798d Standardize use of function getCommonSubstitutionArray 2017-10-09 14:51:42 +02:00
Laurent Destailleur
8f24a86352 NEW If max nb of generation is reached, date for next gen is striked 2017-10-09 14:16:22 +02:00
Laurent Destailleur
6402d5a2e4 Fix translation 2017-10-09 13:30:08 +02:00
Regis Houssin
ecd55c67e3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member 2017-10-09 12:40:28 +02:00
Regis Houssin
f2d9288db5 NEW add company alias name when create company from member 2017-10-09 12:38:44 +02:00
Rui Strecht
4a06ca9885 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-09 10:37:27 +01:00
Regis Houssin
4a30448ff4 Fix: use fullname instead id is more explicit 2017-10-09 11:34:28 +02:00
Regis Houssin
3d3f6d14b5 Fix: uniformize fields size and maxlength compared to db size 2017-10-09 11:26:49 +02:00
Laurent Destailleur
725e57b73e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-09 11:20:15 +02:00
Regis Houssin
64d9b625ff Fix: wrong POST GET name 2017-10-09 11:03:16 +02:00
Laurent Destailleur
1fd712d712 Fix help 2017-10-09 10:59:39 +02:00
Laurent Destailleur
14b667c9f1 Merge pull request #7587 from hregis/develop_admin 
NEW add doActions hook in admin ihm
 2017-10-09 10:48:52 +02:00
Laurent Destailleur
245c048b40 Merge pull request #7577 from OPEN-DSI/fix_0001 
Fix carriage return when get full address formated for output on documents
 2017-10-09 10:48:26 +02:00
Laurent Destailleur
e405e5d020 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-09 10:43:53 +02:00
Laurent Destailleur
3e0ccd6312 FIX #7585 2017-10-09 10:43:19 +02:00
Laurent Destailleur
bd8beb45b9 Merge pull request #7595 from Nicos-git/RestAPI 
FIX: REST function addTimeSpent
 2017-10-09 09:55:13 +02:00
KHELIFA
d77dfb9199 Fix return chariot 2017-10-09 09:26:25 +02:00
Nicolas Leichtle
5f2c5a6c53 New Extend REST POST function "/documents" to support projects and tasks 2017-10-08 23:26:35 +02:00
Laurent Destailleur
67c33840cf Code comment 2017-10-08 23:19:19 +02:00
Nicolas Leichtle
b110eb517d Merge branch 'develop' into RestAPI 2017-10-08 23:15:14 +02:00
Laurent Destailleur
ec9c355791 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-08 19:46:48 +02:00
Laurent Destailleur
257fe68f13 Prepare 6.0.3 2017-10-08 19:46:24 +02:00
Laurent Destailleur
33624e1001 NEW Attaching doc automatically in email is now a parameter of template. 2017-10-08 16:34:42 +02:00
Laurent Destailleur
21bb799e7b Merge pull request #7592 from atm-maxime/fix_advtarget 
Fix : missing new target type in advance target selection
 2017-10-08 15:06:52 +02:00
Laurent Destailleur
ce7ce82801 Enhance email template editor 2017-10-08 14:51:10 +02:00
Maxime Kohlhaas
8513ddb9b4 Fix : missing new target type in advance target selection 2017-10-08 10:08:49 +02:00
Laurent Destailleur
4c23363400 Fix creation of tax payment 2017-10-07 21:27:18 +02:00