lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,192 Commits 43 Branches 150 Tags 886 MiB
51640c19bb
Commit Graph

51192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphaël Doursenaud
1dfd3f396e Fixed md theme name 2015-12-04 18:04:41 +01:00
Florian HENRY
955fad910d FIX : Bug: $this is not accessible in static context in 
Mailing::libStatutDest #4050
 2015-12-04 17:32:17 +01:00
Laurent Destailleur
bcadc33e31 Debug visibility on task/projects 2015-12-04 15:37:28 +01:00
aspangaro
6598ac6745 Add rights to see tab (hrm->employee->read) 2015-12-04 12:48:36 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
Laurent Destailleur
e6ebc9c293 More complete tooltip help 2015-12-04 12:24:36 +01:00
Laurent Destailleur
00aa5aace7 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	dev/codesniffer/ruleset.xml
 2015-12-04 12:14:24 +01:00
Laurent Destailleur
a24cbf5585 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-04 12:12:23 +01:00
Laurent Destailleur
4dd1cb3e77 Theme MD looks ready for 3.9 now. 2015-12-04 12:12:12 +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
Laurent Destailleur
7d7a978ba0 Merge pull request #4145 from FHenry/3.8 
FIX :  Contract date inconsistency between /comm/card.php and #4089
 2015-12-04 10:25:50 +01:00
Laurent Destailleur
d2b221cfd1 Upgrade PHPCS rules 2015-12-04 10:22:27 +01:00
Raphaël Doursenaud
b45d4a2a51 [Qual] OOP detection of PHP MySQL driver 2015-12-03 22:31:13 +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
fmarcet
eb98bd1e78 FIX: Not delete a product when have customer price 2015-12-03 14:02:26 +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
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
Florian HENRY
3dec67ffdf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-03 12:58:39 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:51:49 +01:00
Laurent Destailleur
64e35255ae Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-03 12:47:32 +01:00
Laurent Destailleur
a7d03af4af Fix sending emails from mergepedtool was just doing wrong things. 2015-12-03 12:47:21 +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
1694481df8 Merge pull request #4134 from FHenry/3.7 
FIX : Use "WHERE true" instead of "WHERE 1" #4132
 2015-12-03 11:58:23 +01:00
Laurent Destailleur
c86d4b51b1 Merge pull request #4133 from ricardomm85/3.8 
minor fix accessing $db
 2015-12-03 11:57:25 +01:00
Laurent Destailleur
a7020506aa Merge pull request #4123 from aspangaro/3.7-accountancy 
Fix : accountancy code on finance journal is not a constant
 2015-12-03 11:55:08 +01:00
Florian HENRY
10a925f7b4 FIX: WHERE 1=1 2015-12-03 11:52:41 +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
Laurent Destailleur
7bad058f47 Merge pull request #4114 from fappels/3.8_fix_round_buyprice 
FIX #3953 rounding of buying price
 2015-12-03 11:48:09 +01:00
Florian HENRY
ee08c4afc4 Display the ref_supplier inside the contract list of /comm/card.php 
#4090
 2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81 Cannot change the date of a contract #4088 2015-12-03 10:58:06 +01:00
Florian HENRY
33e73afda6 FIX : Cannot change the date of a contract #4088 2015-12-03 10:51:03 +01:00
Florian HENRY
281eaf2987 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-03 10:27:23 +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