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

69764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b8ae88cf26
Merge pull request #9602 from grandoc/new_branch_24_09_2018 
Standardize and update code
 2018-09-27 09:19:59 +02:00
Laurent Destailleur
ce141d8051
Merge pull request #9601 from frederic34/patch-9 
remove superfluous space
 2018-09-27 09:18:58 +02:00
Laurent Destailleur
7e58662c6f
Merge branch 'develop' into patch-9 2018-09-27 09:18:42 +02:00
Laurent Destailleur
6f92c230aa
Merge pull request #9600 from grandoc/new_branch_23_09_2018 
Translated comment
 2018-09-27 09:17:53 +02:00
Laurent Destailleur
29893daf6f
Merge pull request #9599 from zeenlym/forgotten_passlink 
NEW Change forgotten password link in general parameters
 2018-09-27 09:17:28 +02:00
Laurent Destailleur
9123329800 FIX Link template invoice to contract 2018-09-26 23:44:27 +02:00
Laurent Destailleur
98b1e13ed7 Work on module socialnetworks 2018-09-26 16:55:46 +02:00
Laurent Destailleur
79ade6a1af Work on website 2018-09-26 15:20:37 +02:00
Laurent Destailleur
0987db765c Work on export/import 2018-09-26 11:28:41 +02:00
Laurent Destailleur
0a4d80012a Support export/import of logo site in web site templates 2018-09-26 11:15:11 +02:00
Laurent Destailleur
f2d53e80e5 Optimize performance of cron that rotate logs 2018-09-26 01:45:24 +02:00
Laurent Destailleur
c2335c0a5e Update websote template 2018-09-26 00:17:53 +02:00
Laurent Destailleur
2ef0cb8d9b Fix cloning 2018-09-25 20:34:05 +02:00
Laurent Destailleur
eff1d1c89e Work on website module 2018-09-25 16:35:59 +02:00
Laurent Destailleur
e6be047178 Work on new management for website module 2018-09-25 15:00:37 +02:00
Laurent Destailleur
b4b6e900f9 css 2018-09-25 11:42:19 +02:00
Laurent Destailleur
ba3ca550ce Fix date in text for substitution. Removed not used translation keys. 2018-09-25 11:36:40 +02:00
Laurent Destailleur
bd523973d8 Add missing translation key 2018-09-25 00:55:03 +02:00
Laurent Destailleur
b93ab79679 FIX Error messages 2018-09-25 00:39:28 +02:00
Laurent Destailleur
822db7c727 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 19:21:31 +02:00
Laurent Destailleur
f04b8eea6d Work on website module 2018-09-24 19:21:21 +02:00
Laurent Destailleur
f1b0bd2a5d Work on website module 2018-09-24 17:12:51 +02:00
Laurent Destailleur
9dc4ad4cc3 Add warning when using editinline 2018-09-24 15:38:13 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Laurent Destailleur
eeda176ed6 FIX Bad position of hook formattachOptions call 2018-09-24 15:13:18 +02:00
Philippe GRAND
3f2f903e6f Specifics comments 2018-09-24 12:22:41 +02:00
Philippe GRAND
d7df74656e Standardize and update code 2018-09-24 12:03:49 +02:00
Philippe GRAND
ac31b79d9d Standardize and update code 2018-09-24 11:58:01 +02:00
Philippe GRAND
1f2493f361 Standardize and update code 2018-09-24 11:45:34 +02:00
Frédéric FRANCE
86072ad1d7
remove superfluous space 2018-09-24 10:43:57 +02:00
Laurent Destailleur
5c0e6eacf6 Use latest instead of last 2018-09-24 10:43:12 +02:00
Laurent Destailleur
436deea4c5 Code comment 2018-09-24 10:26:49 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00
Laurent Destailleur
40bed96a01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-24 10:15:20 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
a4cd96e03c Clean code when there is no setup to do 2018-09-24 10:08:57 +02:00
Laurent Destailleur
2dbb82fc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2 Missing trans 2018-09-24 10:03:08 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Yanis LISIMA
753089a99d NEW Change forgotten password link in general parameters 
In some cases, user password are managed by external systems (ex: LDAP).
The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.
 2018-09-23 21:26:07 +02:00
Laurent Destailleur
d9ccc7624b Standardize code 2018-09-23 16:09:25 +02:00
Laurent Destailleur
33f9600c9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 15:58:43 +02:00
Laurent Destailleur
6c814b32bd Standardize cod 2018-09-23 15:58:33 +02:00
Laurent Destailleur
f88170e22a
Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks 
NEW Add somes hooks in bank planned entries
 2018-09-23 15:49:50 +02:00
Laurent Destailleur
94c43716b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 15:47:35 +02:00
Laurent Destailleur
48ca7e4603 Typo 2018-09-23 15:47:13 +02:00
Laurent Destailleur
969be3a2a7
Merge pull request #9595 from ptibogxiv/patch-66 
FIX number mailing for a contact with multicompany
 2018-09-23 15:45:06 +02:00
Laurent Destailleur
39e9029e41
Update contact.class.php 2018-09-23 15:44:44 +02:00
Laurent Destailleur
9ddc1770e8
Merge pull request #9501 from atm-gauthier/7.0_fix_tva_if_buyer_hors_cee_and_particulier 
FIX : According to french law, if seller is in France and buyer isn't…
 2018-09-23 15:41:33 +02:00