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

56461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
03cb5c66b8 Fix javascript error on french language 2016-07-26 14:17:45 +02:00
Laurent Destailleur
2866d60240 Revert "change jsgantt to jsGanttImproved" 
This reverts commit caf963351b.
 2016-07-26 13:59:08 +02:00
Sergio Sanchis Climent
71d153c4e2 change jsgantt to jsGanttImproved 2016-07-26 13:56:34 +02:00
Laurent Destailleur
9e70f49fc5 Update changelog 2016-07-26 13:56:11 +02:00
Laurent Destailleur
c0db2e8b38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-26 13:52:55 +02:00
Laurent Destailleur
27e0859051 Fix travis error 2016-07-26 13:52:43 +02:00
Laurent Destailleur
a3d0c01b68 Fix warning 2016-07-26 13:51:13 +02:00
Juanjo Menent
0459c6f682 Merge pull request #5545 from GPCsolutions/develop-orderinterfix 
Fix: Fixed interventions from order.
 2016-07-26 12:01:09 +02:00
Juanjo Menent
b4a88ca312 Merge pull request #5547 from olsesacl/#5520 
FIX #5520 Bug: JavaScript error on project Gantt view
 2016-07-26 11:59:48 +02:00
SAINT-PATRICE
d363205648 Update paiement.php 
Test non optimisé
 2016-07-26 11:55:26 +02:00
Laurent Destailleur
f0fa9205a2 Sync transifex 2016-07-26 09:56:20 +02:00
florian HENRY
e420a75fa0 SQL query style 2016-07-26 09:01:28 +02:00
florian HENRY
419dd3095b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	htdocs/societe/class/societe.class.php
 2016-07-26 08:59:40 +02:00
Sergio Sanchis Climent
caf963351b change jsgantt to jsGanttImproved 2016-07-26 01:59:27 +02:00
Laurent Destailleur
e0f5a3cfe9 Fix send email in mass action 2016-07-25 21:51:29 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
fc1c38420c Revert "Fix Performance improvement with many extrafields" 
This reverts commit ae18178d56.
 2016-07-25 19:47:07 +02:00
Laurent Destailleur
a0076bbabc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-25 19:43:22 +02:00
Laurent Destailleur
a82e551a54 Start to work to mutualize code of mass actions 2016-07-25 19:43:07 +02:00
Juanjo Menent
8f0738f792 Merge pull request #5541 from marcosgdf/bug-5540 
FIX #5540 getFormMail is not registered as addReplace hook
 2016-07-25 18:23:08 +02:00
Juanjo Menent
71b8ab8336 Merge pull request #5542 from hregis/3.8_bug 
Fix: missing sourcetype can create false positive
 2016-07-25 18:21:44 +02:00
Raphaël Doursenaud
052a11a5c0
Fixed interventions from order. 
Handling of predefined services was buggy and resulted in an SQL error
because of uninitialized duration.

Generalized services duration handling and exposed it in the module's
admin page.
 2016-07-25 17:24:57 +02:00
Regis Houssin
d8f77abf31 Fix: missing sourcetype can create fault positive 2016-07-25 14:36:20 +02:00
Marcos García de La Fuente
3029fd0fe1 FIX #5540 getFormMail is not registered as addReplace hook 2016-07-25 13:18:41 +02:00
Juanjo Menent
9e67249b98 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-07-25 12:43:44 +02:00
Juanjo Menent
e59a4d510b Merge pull request #5538 from marcosgdf/bug-5537 
FIX #5537 AJAX project search does not work properly
 2016-07-25 12:19:29 +02:00
Marcos García de La Fuente
3ef3a038cf Merge branch '3.9' into bug-5537 2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91 FIX #5537 AJAX project search does not work properly 2016-07-25 11:49:04 +02:00
BENKE Charlie
6acff5dcb5 Update agenda_other.php 2016-07-25 11:31:10 +02:00
BENKE Charlie
cba9bae124 Update agenda_other.php 2016-07-25 11:30:05 +02:00
BENKE Charlie
415bdbe9b5 Update html.formfile.class.php 2016-07-25 11:22:53 +02:00
BENKE Charlie
e948002353 New : edition feature on action/agenda 2016-07-25 11:21:00 +02:00
Juanjo Menent
600a10fa16 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-07-25 10:25:07 +02:00
Juanjo Menent
437a8b53ae Merge pull request #5530 from GPCsolutions/forcedinstallfixes 
Forced install fixes
 2016-07-25 10:24:33 +02:00
Juanjo Menent
250d29542f Merge pull request #5527 from simnandez/3.9 
Fix Performance improvement with many extrafields
 2016-07-25 10:23:14 +02:00
Laurent Destailleur
834356b61e Fix missing opacity css 2016-07-24 22:24:18 +02:00
Laurent Destailleur
efe1cde388 More keywords in desc 2016-07-24 22:21:07 +02:00
Laurent Destailleur
4448c5e86f Removed "small" 2016-07-24 22:21:00 +02:00
Laurent Destailleur
23753d849c FIX Data not lost when error during creation of leave request. 
Conflicts:
	htdocs/holiday/define_holiday.php
 2016-07-24 22:20:21 +02:00
Laurent Destailleur
9661f08b38 Fix filter on dates of services 2016-07-24 22:17:46 +02:00
Laurent Destailleur
50f76cbb9c Fix bad css 2016-07-24 22:17:40 +02:00
Laurent Destailleur
42fc6606f9 Fix filter on dates of services 2016-07-24 22:17:12 +02:00
Laurent Destailleur
43a7109c69 Fix bad css 2016-07-24 21:50:04 +02:00
BENKE Charlie
66d0d09769 Add : additionnal origin of mouvement 
Main problem is the difference between folder and the class of project
Maybe one time (for a major version of dolibarr (5, 6 ...) we start to standadisation of all modules
 2016-07-23 16:30:12 +02:00
Laurent Destailleur
60c71d88f7 Fix missing loading admin langs 2016-07-23 14:30:48 +02:00
Laurent Destailleur
59e9d7f397 Fix the repositioning works better with new system class="reposition" 
compared to old system (#tag)
 2016-07-23 13:41:06 +02:00
Laurent Destailleur
343561be7a Fix colspan 2016-07-23 13:37:17 +02:00
Laurent Destailleur
867a0072e3 Fix forcing on module setup was not working 2016-07-23 13:20:34 +02:00