Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

18964 Commits

Author SHA1 Message Date
Laurent Destailleur
13473be6e9 Merge pull request #11923 from frederic34/patch-14 
Update box_contacts.php to see email
 2019-09-27 12:16:06 +02:00
Laurent Destailleur
138b494b98 Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
0aea902681 Merge pull request #11958 from altatof/clipboard 
NEW : add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant
 2019-09-27 12:14:09 +02:00
Laurent Destailleur
881c90ab74 Merge pull request #11953 from grandoc/new_branch_24_09_2019 
add missing translation
 2019-09-27 11:56:01 +02:00
Laurent Destailleur
f96c9c3bb5 FIX #11931 #11963 2019-09-27 11:51:34 +02:00
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
03086026b8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +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 De Coninck
040e7bdfdf working solution about filtering the contacs of one company 2019-09-25 18:24:36 +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
Tim Otte
b673c88fab Fixed sql error 2019-09-25 10:25:00 +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
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Alexandre SPANGARO
1b2558bb1f typo 2019-09-23 21:43:11 +02:00
Alexandre SPANGARO
e5268f98c2 Correct Stickler 2019-09-23 20:48:30 +02:00
Alexandre SPANGARO
6d4c0c34b1 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-09-23 20:43:06 +02:00
Alexandre SPANGARO
a005408d83 NEW Accountancy - Add an option to hide FAQ on index and add widget in area 2019-09-23 20:42:50 +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