lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,902 Commits 43 Branches 150 Tags 886 MiB
2405276a36
Commit Graph

50902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BENKE Charlie
2405276a36 Update card.php 2015-12-15 11:54:00 +01:00
BENKE Charlie
ad7c90fc19 Update fichinter.class.php 2015-12-15 11:52:11 +01:00
BENKE Charlie
85344aa955 Update llx_fichinter.sql 2015-12-15 11:46:56 +01:00
BENKE Charlie
3e8c670e84 Update 3.8.0-3.9.0.sql 2015-12-15 11:46:20 +01:00
BENKE Charlie
02f4c9879b Update card.php 2015-12-05 10:16:56 +01:00
BENKE Charlie
1da6b06605 Update 3.8.0-3.9.0.sql 2015-12-04 13:23:13 +01:00
BENKE Charlie
46aaf9c270 Update 3.8.0-3.9.0.sql 2015-12-04 12:34:17 +01:00
BENKE Charlie
7ea3df4d06 add date start and end of intervention 
add dateo (date open/start) and datee (date end) of intervention
this date are filled by the fichinterdet date and can be displayed on planning
 2015-12-04 11:28:28 +01:00
BENKE Charlie
f3ff8c5951 add dates of intervention 2015-12-04 11:25:07 +01:00
BENKE Charlie
bf9cb46aad update dateo and datee based on fichinterdet 
we update fields datee and dateo based on fichinterdet
like this we can show on fichinter the start and the end of the intervention
 2015-12-04 11:16:49 +01:00
BENKE Charlie
2c95344f05 Add date start and end of intervention 2015-12-04 11:09:05 +01:00
Laurent Destailleur
2b149aa514 Merge pull request #4148 from AlainRnet/develop 
Update fraise.modules.php
 2015-12-04 10:31:34 +01:00
Laurent Destailleur
53a8cb4475 Merge pull request #4130 from bafbes/develop 
add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions
 2015-12-04 10:30:51 +01:00
AlainRnet
ebc1105b5c Update fraise.modules.php 
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
 2015-12-03 21:09:09 +01:00
Bahfir Abbes
fb692f4cd5 Update card.php 2015-12-03 19:10:15 +01:00
Laurent Destailleur
43ab23ca28 Fix doxygen 2015-12-03 14:54:39 +01:00
Laurent Destailleur
6be9a04a56 Fix detection of last version on sourceforge 2015-12-03 14:52:13 +01:00
Laurent Destailleur
e4f0b9ba15 Fix detection of last version on sourceforge 2015-12-03 14:46:34 +01:00
Laurent Destailleur
1658bee81c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-03 13:06:37 +01:00
Laurent Destailleur
480a398f36 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/holiday/card.php
	htdocs/resource/list.php
 2015-12-03 13:06:20 +01:00
Laurent Destailleur
6763b5baa0 Merge pull request #4144 from FHenry/develop 
FIX : Cannot change the date of a contract #4088
 2015-12-03 12:06:48 +01:00
Laurent Destailleur
c088de517e Merge pull request #4140 from GPCsolutions/dolibarr-sql 
[Qual] More robust sorting
 2015-12-03 12:06:01 +01:00
Laurent Destailleur
540609d5ed Merge pull request #4139 from bafbes/patch-9 
Update products.lang - include translation for units key in product/card.php
 2015-12-03 12:01:10 +01:00
Laurent Destailleur
6b3e20dcdc Merge pull request #4138 from GPCsolutions/dolibarr-4137 
Fix #4137 Salaries parameter saving
 2015-12-03 12:00:47 +01:00
Laurent Destailleur
63879c1ca6 Merge pull request #4122 from mrsof/patch-7 
FIX: Cannot set property '_renderItem of undefined
 2015-12-03 11:52:30 +01:00
Florian HENRY
33e73afda6 FIX : Cannot change the date of a contract #4088 2015-12-03 10:51:03 +01:00
Laurent Destailleur
cb8227f086 Fix syntax error 2015-12-03 10:04:13 +01:00
Laurent Destailleur
2f02919c70 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-03 10:01:51 +01:00
Laurent Destailleur
c664a492e6 Removed a not used field making mysql error (reserved word). Also this 
field is not required by dolibarr core.
 2015-12-03 10:01:40 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
Laurent Destailleur
9aaab2c1dc Work on select fields on project list 2015-12-02 23:20:19 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on 
result of a select.
 2015-12-02 22:00:39 +01:00
Raphaël Doursenaud
0c5c762c1c [Qual] More robust sorting 
Only allow valid values and discard others.
Do not use user supplied data in SQL query.
 2015-12-02 21:15:59 +01:00
Bahfir Abbes
7841c97387 Update products.lang 2015-12-02 19:34:02 +01:00
Bahfir Abbes
134adcf637 Update products.lang 2015-12-02 18:55:51 +01:00
Raphaël Doursenaud
e1d5b4483a Fix #4137 Salaries parameter saving 
Button was outside of the form.
 2015-12-02 18:31:38 +01:00
Bahfir Abbes
5360ea65bf Update card.php 2015-12-01 21:26:04 +01:00
abb
46611908ae add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions 2015-12-01 11:10:05 +01:00
Laurent Destailleur
6df4948a73 Fix text 2015-12-01 03:12:12 +01:00
Laurent Destailleur
357bc7a00c Fix color link 2015-11-30 21:40:14 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Sof
daa8399764 FIX: Cannot set property '_renderItem of undefined 
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
 2015-11-30 20:31:42 +01:00
Sof
292d3ba959 FIX: Cannot set property '_renderItem of undefined 
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
 2015-11-30 20:28:36 +01:00
Laurent Destailleur
d6d2a2fadb Merge pull request #4118 from patas-monkey/patch-1 
Progress column not wide enough for 100%
 2015-11-30 19:16:54 +01:00
Laurent Destailleur
7e74b6af5c Merge pull request #4117 from frederic34/patch-3 
cleaning travis.yml
 2015-11-30 19:16:19 +01:00
Laurent Destailleur
62634a1db8 Merge pull request #4115 from mrsof/patch-3 
FIX: Multiple syntax errors
 2015-11-30 19:14:37 +01:00
Laurent Destailleur
863f81160f Merge pull request #4116 from IonAgorria/patch-2 
Only print : when both $h and $m are set
 2015-11-30 18:54:50 +01:00
Laurent Destailleur
3dfed0fc31 Merge pull request #4119 from mrsof/patch-4 
FIX: Warning: implode(): Invalid arguments passed
 2015-11-30 18:54:04 +01:00
Sof
09b61fd185 Update extrafields.class.php 2015-11-30 18:06:15 +01:00
Frédéric FRANCE
9e988ee03e Update .travis.yml 2015-11-30 12:35:19 +01:00