Commit Graph

43899 Commits

Author SHA1 Message Date
Raphaël Doursenaud
2cf36d157f FIX #3953 Don't round supplier price
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
2015-12-07 14:24:24 +01:00
Laurent Destailleur
5710bcd38a Merge pull request #4165 from AlainRnet/patch-2
Update const.php
2015-12-06 14:46:15 +01:00
Laurent Destailleur
f73c059bc4 Merge pull request #4159 from belyas/develop
addLogCP and updateSoledCP methodes throwing warnings when assigning leave for a user
2015-12-06 14:44:46 +01:00
Laurent Destailleur
939a36428c Merge pull request #4156 from grandoc/develop
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
2aca50f7f8 Removed useless string 2015-12-06 13:56:15 +01:00
Laurent Destailleur
9c227d154e Clean duplicate translation key 2015-12-06 13:37:48 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
Laurent Destailleur
d4268c079f Fix syntax error 2015-12-06 12:23:49 +01:00
Laurent Destailleur
0279e99b0a Update warning for mysql 5.5.4* bug 2015-12-06 12:04:34 +01:00
AlainRnet
50cf96bd16 Update const.php
link to help file
2015-12-06 12:01:59 +01:00
Laurent Destailleur
745875d21e NEW Can choose fields to show on project list 2015-12-06 01:19:27 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
497c30d994 NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:38:45 +01:00
Laurent Destailleur
9d3451b31d NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:31:32 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
Laurent Destailleur
e002021d7d Fix td balance 2015-12-05 17:49:08 +01:00
yassine belkaid
8c22274300 Fixed assigning exceptional leave for a user 2015-12-05 00:41:00 +00:00
yassine belkaid
1075940e93 ignore conf/conf.php file 2015-12-05 00:37:32 +00:00
Laurent Destailleur
4a2bda3491 Look enhancement 2015-12-04 23:25:34 +01:00
philippe grand
f640486c8b [Qual] Uniformize code 2015-12-04 22:50:03 +01:00
Laurent Destailleur
5cd43d2df0 Some debug on new features 2015-12-04 20:51:34 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00
Laurent Destailleur
eb795a7a9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-04 18:39:39 +01:00
Laurent Destailleur
c91aa0aa90 Merge pull request #4154 from GPCsolutions/dolibarr-md-icons
Material Design icons
2015-12-04 18:39:26 +01:00
Laurent Destailleur
8c03e46a83 Removed a TODO 2015-12-04 18:33:57 +01:00
Laurent Destailleur
b169b976b7 Merge pull request #4152 from GPCsolutions/dolibarr-md
Fixed md theme name
2015-12-04 18:30:01 +01:00
Laurent Destailleur
d0d7e83929 Merge pull request #4149 from GPCsolutions/dolibarr-php7
[Qual] OOP detection of PHP MySQL driver
2015-12-04 18:25:14 +01:00
Laurent Destailleur
6542da404e Merge pull request #4129 from aspangaro/develop-bank
New HRM Add bank tab in user to pay salary or expense report
2015-12-04 18:23:47 +01:00
Raphaël Doursenaud
87d6a5926b Fixed md theme name 2015-12-04 18:05:04 +01:00
Raphaël Doursenaud
a8f67808de NEW Used matching icons for Material Design theme
Icons from https://www.google.com/design/icons/
Licenced under CC BY 4.0
2015-12-04 18:04:41 +01:00
Raphaël Doursenaud
1dfd3f396e Fixed md theme name 2015-12-04 18:04:41 +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
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
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
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