Commit Graph

80525 Commits

Author SHA1 Message Date
Alexandre SPANGARO
8668e7157a Add bookmark fa-icon 2019-10-03 21:00:59 +02:00
Alexandre SPANGARO
d0840b038f Remove constant MAIN_DISABLE_FONT_AWESOME_5 2019-10-03 20:42:02 +02:00
Alexandre SPANGARO
14381927c7 Fix Bank Fa-icon 2019-10-03 20:32:15 +02:00
Frédéric FRANCE
ee42cd000e
duration of fichinter rec 2019-10-03 19:07:26 +02:00
Laurent Destailleur
aa484d484d css 2019-10-03 19:02:29 +02:00
Laurent Destailleur
457117762a Fix bad br 2019-10-03 18:32:31 +02:00
Laurent Destailleur
ad4aa39ec5
Merge pull request #11986 from atm-john/develop_dropdown_bookmark
NEW :  dropdown bookmark and search
2019-10-03 18:18:31 +02:00
Laurent Destailleur
c223c5635b
Merge pull request #12010 from laudeco/feature/12006-country-on-pdf-footer
[#12006] - adds the country in the address of the PDF's footer
2019-10-03 18:15:39 +02:00
Laurent Destailleur
e52b294779
Merge pull request #12012 from frederic34/ficheinter_rec
restore unfinished old commit
2019-10-03 18:10:16 +02:00
Laurent Destailleur
e9163015e5
Merge pull request #12029 from altatof/limitlang
NEW : add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed
2019-10-03 18:08:35 +02:00
Laurent Destailleur
2c91dca882
Merge pull request #12023 from frederic34/cutlonglines
cut long lines
2019-10-03 18:06:35 +02:00
Laurent Destailleur
1f3e250053
Update card.php 2019-10-03 17:58:07 +02:00
Laurent Destailleur
02af9b8fa4
Update card.php 2019-10-03 17:56:55 +02:00
Laurent Destailleur
b787e53020 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
Laurent Destailleur
7412335217
Merge pull request #12031 from atm-lena/8.0_fix_missingbegin
FIX missing begin()
2019-10-03 17:50:35 +02:00
Laurent Destailleur
74d3850ec8
Merge pull request #12030 from altatof/fckticket
NEW : FCKeditor setup for tickets
2019-10-03 17:49:59 +02:00
Laurent Destailleur
b3e2163903
Merge pull request #12014 from andreubisquerra/develop
Price with tax when manual modify price in TakePOS
2019-10-03 17:49:05 +02:00
Laurent Destailleur
09f7a68d6d Show ref of product on mouse hover thumbs 2019-10-03 17:40:59 +02:00
atm-lena
ae01bd8f07 FIX missing begin() 2019-10-03 17:23:16 +02:00
Laurent Destailleur
331148499a Fix check on terminal setup 2019-10-03 17:11:41 +02:00
Laurent Destailleur
8904ce5732 Removed warning we don't want 2019-10-03 16:57:12 +02:00
Laurent Destailleur
f0122a5766 Fix phpcs 2019-10-03 16:54:33 +02:00
altairis
699a3391c9 FCKeditor setup for tickets 2019-10-03 16:51:05 +02:00
oscim
d368bc1b6a
Update user.class.php
actually the create_from_member method does not require this change
2019-10-03 15:58:40 +02:00
Laurent Destailleur
9762d77958
Merge pull request #12024 from frederic34/patch-17
Update dolgraph.class.php
2019-10-03 15:57:48 +02:00
Laurent Destailleur
e59c70116f
Merge pull request #12021 from frederic34/patch-14
fix broken search
2019-10-03 15:57:31 +02:00
Laurent Destailleur
fce33240f3
Merge pull request #12013 from Ahuahuachi/develop
Translate french documentation
2019-10-03 15:56:42 +02:00
stickler-ci
3168ad404c Fixing style errors. 2019-10-03 13:56:33 +00:00
Laurent Destailleur
c529979005
Merge pull request #12016 from yashkothari1946/yashkothari1946-patch-1
#11966 bug fix
2019-10-03 15:55:46 +02:00
Laurent Destailleur
78751fe0ad
Update newpayment.php 2019-10-03 15:54:52 +02:00
Laurent Destailleur
03614536f9
Merge pull request #12018 from frederic34/patch-12
backport commit for setmulticurrency
2019-10-03 15:54:01 +02:00
Laurent Destailleur
648a2881ed
Merge pull request #12022 from frederic34/patch-15
Update list.php
2019-10-03 15:53:43 +02:00
Laurent Destailleur
95c73f7b46
Merge pull request #12025 from seebag/fix/no_sub_members
Fix for no subscription members
2019-10-03 15:52:16 +02:00
altairis
153121b95d add MAIN_LANGUAGES_ALLOWED constant 2019-10-03 15:48:24 +02:00
Sebastien Baguet
d11bb9570c Add French and English translation 2019-10-03 13:44:40 +02:00
Sebastien Baguet
5dbf34a864 Small fix on a query 2019-10-03 13:34:47 +02:00
Laurent Destailleur
5bf9b5116f Clean code 2019-10-03 10:13:07 +02:00
Laurent Destailleur
6a40c3d8f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-03 10:08:17 +02:00
Laurent Destailleur
d754338096 Migration to fontawesome v5 seems complete. We removed v4 files. 2019-10-03 10:08:04 +02:00
stickler-ci
3cad71f2c1 Fixing style errors. 2019-10-03 08:00:38 +00:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
oscim
9f2ac7cae3
Fix error in triggers process
If methode create_from_contact is called; In process this method containt call create methode, but trigger by action USER_CREATE is called twice. 
the call to the create method should not trigger triggers

same for the create_from_members method
2019-10-03 09:47:06 +02:00
John Botella
135621c02b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-10-03 08:51:22 +02:00
stickler-ci
09b423d14d Fixing style errors. 2019-10-02 22:35:09 +00:00
Sebastien Baguet
9daffcbe07 Fix for no subscription members 2019-10-03 00:29:41 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php 2019-10-03 00:22:14 +02:00
Frédéric FRANCE
67cb432cfb
cut long lines 2019-10-02 23:10:33 +02:00