Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 06:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
79,034 Commits 36 Branches 190 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

17941 Commits

Author SHA1 Message Date
Alexandre SPANGARO
e38bb89a2e NEW Add fa_icon on load_fiche_titre 2019-09-27 11:48:40 +02:00
Laurent Destailleur
6fbb5c0db7 Merge pull request #11963 from aspangaro/11.0_fa_icon 
#11931 NEW Add fa_icon "tools" for load_fiche_titre
 2019-09-27 11:38:44 +02:00
Laurent Destailleur
e03667dc75 Merge pull request #11939 from frederic34/patch-17 
fix badge linked resources on fichinter
 2019-09-27 11:32:27 +02:00
Alexandre SPANGARO
4610f4391f Merge branch 'develop' into 11.0_fa_icon 2019-09-27 11:29:39 +02:00
Laurent Destailleur
148afcaca8 Merge pull request #11964 from hregis/8.0_mc2 
FIX getObjectSid is only for Active Directory
 2019-09-27 11:25:14 +02:00
Laurent Destailleur
2b6b1a3e1c Fix syntax error 2019-09-27 11:12:21 +02:00
Frédéric FRANCE
5eb0fb462b Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-27 07:59:02 +02:00
Laurent Destailleur
211d4ec78e Merge pull request #11949 from frederic34/boxinfos 
add infos missing in box
 2019-09-26 23:43:40 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
Regis Houssin
ffe866f96f FIX getObjectSid is only for Active Directory 2019-09-25 19:24:07 +02:00
Laurent Destailleur
7d91649520 NEW Add extrafields in export of expense report (and holiday) 2019-09-25 15:48:44 +02:00
Alexandre SPANGARO
f4929c5315 NEW Add fa_icon "tools" for load_fiche_titre 2019-09-25 15:24:52 +02:00
altairis
c59e26457d add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant 2019-09-25 12:18:19 +02:00
Frédéric FRANCE
41cb628d05 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Ferran Marcet
1c9c72ced7 Qual: Clean code on sellist extrafields. Translate if query has only one field 2019-09-24 17:52:11 +02:00
Laurent Destailleur
b3c49f2ec8 End of dev for extrafields on holiday 2019-09-24 16:26:15 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
19c78d42e9 Fix az09 -> aZ09 2019-09-24 14:20:29 +02:00
Laurent Destailleur
c53be23122 FIX Filtering the HTTP Header "Accept-Language". 2019-09-24 13:54:52 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Philippe GRAND
7ec43e8b59 add missing translation 2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent Destailleur
1e65a478a8 Fix remove warnings 2019-09-23 19:21:06 +02:00
Frédéric FRANCE
8f41e0f9fe clean code 2019-09-23 18:39:21 +02:00
Frédéric FRANCE
57509f1312 box ficheinter 2019-09-23 18:13:26 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
Laurent Destailleur
8ac0383fa0 FIX Send email from expense report card. 
FIX Alias name is not into the email recipient label.
 2019-09-23 12:36:12 +02:00
Laurent Destailleur
1584a4bf79 Add trigger event USER_SENTBYMAIL in agenda 2019-09-23 12:27:51 +02:00
Frédéric FRANCE
31094936c1 wip 2019-09-23 10:56:11 +02:00
Frédéric FRANCE
44ba0deae6 fix badge linked resources on fichinter 2019-09-20 17:58:22 +02:00
Alexandre SPANGARO
1e49fd0d45 Translate 2019-09-20 15:07:58 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +02:00
Frédéric FRANCE
61e358bb9d Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-18 21:23:26 +02:00
John Botella
d72548bd76 add filters 2019-09-18 13:43:34 +02:00
Frédéric FRANCE
c01ab451cc Update box_fournisseurs.php 2019-09-17 23:04:43 +02:00
Frédéric FRANCE
c38c0bec1c Update box_fournisseurs.php 2019-09-17 23:03:37 +02:00
Frédéric FRANCE
87d41256d4 Update box_contacts.php 2019-09-17 22:59:23 +02:00
Laurent Destailleur
3f6afa810c Code comment 2019-09-17 17:55:30 +02:00
Laurent De Coninck
49b75e3f52 support referent in the beluga export. 
The beluga export of a project, now supports additional referents, coming from the hooks. When the element is present in the view of all elements of the project, the beluga export will also export this element.

[see: X]
 2019-09-17 17:40:42 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on 
FIX Export of leave request show the number of open days
 2019-09-17 13:17:25 +02:00
Frédéric FRANCE
a44836ae40 Update CMailFile.class.php 2019-09-17 10:15:55 +02:00
VESSILLER
3654a5d01c FIX selectFields for GROUP BY and show only if units defined 2019-09-17 10:05:35 +02:00
Frédéric FRANCE
850b9fd52a Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Frédéric FRANCE
e43f3a0f58 Update functions.lib.php 2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a Update functions.lib.php 2019-09-16 17:57:40 +02:00
VESSILLER
555ea977c9 NEW Add units in select products lines 2019-09-16 15:32:31 +02:00