lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,960 Commits 43 Branches 150 Tags 886 MiB
b59d8a6473
Commit Graph

65960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b59d8a6473
Merge pull request #8501 from ATM-Consulting/develop_atm 
NEW: send mails from project card
 2018-04-05 16:39:06 +02:00
Laurent Destailleur
3dbe200163
Merge pull request #8497 from ruistrecht-alt/FIX_missing_closing_parentheses 
FIX: missing closing parentheses
 2018-04-05 16:18:12 +02:00
Laurent Destailleur
d19514fd99
Merge pull request #8496 from hregis/develop_bug5 
Fix: multiple avoid Warning and errors
 2018-04-05 16:16:48 +02:00
Laurent Destailleur
dd934c89bf
Merge pull request #8507 from frederic34/patch-2 
Translation of error message
 2018-04-05 16:12:36 +02:00
Laurent Destailleur
5b50b8bd40
Merge pull request #8491 from hregis/develop_multicompany 
Fix: possibility to change entity for new thirdparty
 2018-04-05 16:11:53 +02:00
Laurent Destailleur
533de639ae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-05 13:25:59 +02:00
Laurent Destailleur
bdf7d648c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 13:24:53 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
1b1a8f7e81 Fix trigger name 2018-04-05 13:21:00 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Laurent Destailleur
28b00fc021
Merge pull request #8486 from hregis/develop_email 
Fix: avoid space in email address
 2018-04-05 13:12:03 +02:00
Laurent Destailleur
08ab67289b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2018-04-05 13:10:11 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00
Laurent Destailleur
9dba68de08
Merge pull request #8484 from hregis/develop_member 
FIX backward compatibility
 2018-04-05 13:00:29 +02:00
Laurent Destailleur
b210360220 More test 2018-04-05 12:59:01 +02:00
Laurent Destailleur
af6ab27b23
Merge pull request #8481 from grandoc/develop 
cleaning code
 2018-04-05 12:45:10 +02:00
Laurent Destailleur
0223d54107 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs

Conflicts:
	htdocs/cron/list.php
 2018-04-05 12:38:42 +02:00
Laurent Destailleur
0de65b7822 FIX Support or multicompany for sheduled jobs 
FIX Use priority to define order of sheduled jobs
 2018-04-05 12:36:14 +02:00
Laurent Destailleur
88b3e08b22 FIX filter/sorting on extrafield on contact list from contact tab 2018-04-05 11:34:26 +02:00
Frédéric FRANCE
90957b3a72
Update mails.lang 2018-04-04 16:00:33 +02:00
Frédéric FRANCE
fd6c1f129c
Update CMailFile.class.php 2018-04-04 15:58:24 +02:00
Laurent Destailleur
8595d7621b Fix POST mut use method POST no GET 2018-04-02 23:30:23 +02:00
Laurent Destailleur
fba40575f7 Remove dead code 2018-04-02 16:39:48 +02:00
Rui Strecht
09f8a21773 Argument should be array 2018-04-02 15:30:19 +01:00
Rui Strecht
b39f617863 Added missing parentheses 2018-04-02 15:29:58 +01:00
Regis Houssin
ef45983f73 Fix: just add fields if not exists 2018-04-02 10:25:15 +02:00
Regis Houssin
9f7fcdc8bf Fix: multiple avoid Warning and errors 2018-04-02 10:18:51 +02:00
Regis Houssin
e09c85cfdb Fix: possibility to change entity for new thirdparty 2018-04-01 13:45:39 +02:00
Laurent Destailleur
2d3a55a6a8 Restore broken confirmation popup 2018-03-31 23:39:08 +02:00
Laurent Destailleur
927d86f27f Revert "NEW: formconfirm in javascript" 
This reverts commit 50790d5527.
 2018-03-31 23:10:12 +02:00
Laurent Destailleur
d21143831c Clean code 2018-03-31 22:44:32 +02:00
Laurent Destailleur
a9ac7e1f29 Debug inventory module 2018-03-31 19:20:38 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Laurent Destailleur
f5079276fb Fix use new extrafield array definition. 
Fix exclude separator from list of fields in lists
 2018-03-31 17:52:31 +02:00
Laurent Destailleur
96c73a13f6 Clean code 2018-03-31 16:45:36 +02:00
Laurent Destailleur
84bb4c6ad7 FIX With x extrafields, request for multicompany label was done x times 2018-03-30 19:51:53 +02:00
Laurent Destailleur
b6e9e0e287 Fix missing hooks 2018-03-30 16:44:58 +02:00
Philippe GRAND
c08015a93a Merge remote-tracking branch 'upstream/develop' into develop 2018-03-30 16:41:10 +02:00
Laurent Destailleur
34c26dffc7 Use constant for contract line status 2018-03-30 15:46:08 +02:00
Regis Houssin
8c610904ac Fix: remove multi spaces 2018-03-30 07:36:23 +02:00
Regis Houssin
546f3f8b96 Fix: avoid space in email address 2018-03-30 07:19:42 +02:00
Laurent Destailleur
b3a454033e Rename parameter 2018-03-29 19:44:38 +02:00
Laurent Destailleur
99ada20f6d Add picto bank 2018-03-29 19:08:51 +02:00
Regis Houssin
38912d6918 Fix: more complete 2018-03-29 18:36:51 +02:00
Regis Houssin
c4ce543294 Fix: backward compatibility 2018-03-29 18:30:31 +02:00
Marc de Lima Lucio
1cc816ff38 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-29 17:36:30 +02:00
Marc de Lima Lucio
a574712dd2 Merge branch 'NEW_mail_project' of github.com:ATM-Consulting/dolibarr into develop_atm 2018-03-29 17:36:08 +02:00
Laurent Destailleur
0978c8f58b CSS 2018-03-29 16:07:49 +02:00