Commit Graph

5501 Commits

Author SHA1 Message Date
Alexis Algoud
370be70e46 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-01-03 16:30:50 +01:00
Ion Agorria
522fb4cf7a Add email template for each line in object 2016-12-31 17:39:01 +01:00
Rabouin Geoffroy
a277a6f190 Typo in SQL request 2016-12-28 10:26:31 +01:00
Laurent Destailleur
c5850d29e7 Fix checksum integrity. Also add a global checksum. 2016-12-26 19:51:24 +01:00
Laurent Destailleur
83a8fcb7f9 Fix filecheck tool. 2016-12-26 19:01:24 +01:00
Laurent Destailleur
374a6d7783 Fix filecheck tool. 2016-12-26 18:50:20 +01:00
Laurent Destailleur
c16489a3c0 Fix add message to explain why some emails fails 2016-12-25 23:14:51 +01:00
Laurent Destailleur
7e2b41402e Fix bad balance of form 2016-12-23 16:24:07 +01:00
Laurent Destailleur
77c320a092 Fix warning for expense report late 2016-12-22 15:33:43 +01:00
Laurent Destailleur
3c79f3acb5 Minor fixes or code comment 2016-12-20 12:06:26 +01:00
Laurent Destailleur
4d624fd875 Debug feature to choose email "from" 2016-12-20 11:23:44 +01:00
Laurent Destailleur
b3d5f40f37 Merge pull request #6166 from atm-gauthier/3.9_fix_wrong_test
FIX : wrong test on dict.php
2016-12-18 10:58:32 +01:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
Alexis Algoud
b7a6a71dff move file to core 2016-12-15 17:20:46 +01:00
gauthier
4dd740fe2f FIX : wrong test on dict.php 2016-12-13 11:41:26 +01:00
Laurent Destailleur
5187ffcc9a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-12 13:03:37 +01:00
Laurent Destailleur
4e86e59fb3 Fix responsive 2016-12-12 13:02:54 +01:00
Laurent Destailleur
7077b4931c Add dump v5 2016-12-12 11:57:50 +01:00
tarrsalah
eb6620f6f6 fix (#6158)default localtax1 and localtax2 values. 2016-12-11 17:56:49 +01:00
phf
f5bffeb535 New get multicurrency rate from document date (propal, order) 2016-12-11 16:30:01 +01:00
Maxime Kohlhaas
194639c30e Missing lang in admin 2016-12-10 22:41:57 +01:00
Maxime Kohlhaas
3ab23ecb7e Better currency rate setup 2016-12-10 22:40:25 +01:00
BENKE Charlie
b74071dc73 Better display on internal/external module info 2016-12-10 19:35:58 +01:00
Laurent Destailleur
211436b436 Better responsive 2016-12-04 01:14:09 +01:00
Laurent Destailleur
8c428ac5b7 Fix responsive design 2016-12-04 00:51:15 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
711961ed18 Fix missing translation 2016-11-29 17:24:40 +01:00
Laurent Destailleur
c33e486828 Fix order of option and picto 2016-11-29 10:42:10 +01:00
Laurent Destailleur
2e5634e60f Fix responsive design 2016-11-27 14:21:23 +01:00
Laurent Destailleur
60c494fd5f Missing dolibarr version in dump file 2016-11-26 17:48:06 +01:00
aspangaro
638563dc5d Fix missing language key in holiday type dictionary 2016-11-22 05:54:44 +01:00
aspangaro
6e66d529f0 Fix missing language key for lead status dictionary 2016-11-22 05:33:33 +01:00
aspangaro
38a31cbd28 Fix missing key language in dictionary email models 2016-11-22 05:25:08 +01:00
aspangaro
213e7d1cd7 Fix Missing language key for dictionary format card 2016-11-21 21:49:08 +01:00
aspangaro
31dd20ec7c Spaces 2016-11-20 22:59:13 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
bfd1ce0095 Fix translation 2016-11-14 15:25:45 +01:00
Laurent Destailleur
b44c746c2e Fix table disabled 2016-11-13 18:31:22 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
bcd3a1a888 NEW Default collation for mysql is now utf8_unicode_ci 2016-11-07 01:53:34 +01:00
Laurent Destailleur
961f7a4e48 Fix label on tab 2016-11-07 00:32:28 +01:00
Laurent Destailleur
4681c84e1d Better responsive 2016-11-06 12:16:10 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/card.php
2016-10-31 21:31:57 +01:00
Laurent Destailleur
ffe4ae5915 Fix php7 compatibility 2016-10-31 21:24:23 +01:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00