Commit Graph

57421 Commits

Author SHA1 Message Date
Laurent Destailleur
f2f8d7b6a5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-27 01:21:34 +01:00
Laurent Destailleur
ade8fd1415 Fix table format 2017-01-27 01:20:56 +01:00
Laurent Destailleur
44b1eb9e4c Merge pull request #6322 from hregis/5.0_bug2
Fix: explode array result is 0,1,2 and not 1,2,3
2017-01-27 00:36:35 +01:00
Laurent Destailleur
3991caa674 Merge branch '5.0' into 5.0_bug2 2017-01-27 00:36:27 +01:00
Laurent Destailleur
65f493ac41 Merge pull request #6321 from hregis/5.0_bug
Fix: avoid numeric errors
2017-01-27 00:27:47 +01:00
Laurent Destailleur
94649514f4 Merge pull request #6329 from fmarcet/5.0
Fix: Invalid variable. Shoud be $object
2017-01-27 00:25:20 +01:00
Laurent Destailleur
4c28e1598b Merge branch '5.0' into 5.0 2017-01-27 00:25:12 +01:00
Laurent Destailleur
9281cb9f8a Merge pull request #6336 from atm-florian/5.0_fix
fix : wrong $formproject->select_projects call on model invoice
2017-01-27 00:21:51 +01:00
Laurent Destailleur
ca79d0c274 Fix PHPCS 2017-01-26 23:36:58 +01:00
Laurent Destailleur
72fd21b183 Fix phpcs 2017-01-26 20:41:16 +01:00
Laurent Destailleur
60ac751d84 Fix translation 2017-01-26 18:21:39 +01:00
Laurent Destailleur
c1b59b1950 Fix several security bugs on expense report 2017-01-26 18:08:00 +01:00
florian HENRY
a333a328d8 FIX #6338 2017-01-26 16:32:36 +01:00
florian HENRY
deceeea8ff fix extrafield list of fileds 2017-01-26 15:44:09 +01:00
florian HENRY
32ebe8f4d7 fix : ressource extrafield in list 2017-01-26 14:38:49 +01:00
Laurent Destailleur
9889f0a4a2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/core/modules/modProjet.class.php
	htdocs/filefunc.inc.php
2017-01-26 10:44:50 +01:00
Laurent Destailleur
eac6ac0247 Fix fields into projet export 2017-01-26 10:41:02 +01:00
florian HENRY
f0ba5cdba8 fix travais 2017-01-26 09:02:47 +01:00
florian HENRY
28115689e8 fix : wrong $formproject->select_projects call on model invoice 2017-01-26 08:46:39 +01:00
Ferran Marcet
0df39149c4 Fix: Hidden option not showing correctly 2017-01-25 19:28:20 +01:00
Ferran Marcet
debfb97903 Fix: Write All Right don't work 2017-01-25 19:12:02 +01:00
Ferran Marcet
daa4536f83 Fix: Contract clone don't work 2017-01-25 18:58:47 +01:00
Ferran Marcet
c56074d48f Fix: Travis error 2017-01-25 16:11:06 +01:00
Ferran Marcet
cb5117ad06 Fix: Invalid variable. Shoud be $object 2017-01-25 16:08:46 +01:00
Ferran Marcet
7f87f6688b Fix: Invalid variable. Shoud be $object 2017-01-25 12:58:21 +01:00
Laurent Destailleur
fd55ded996 Prepare 4.0.4 version 2017-01-24 18:45:57 +01:00
Laurent Destailleur
755d353dfa Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/core/class/html.formprojet.class.php
2017-01-24 18:41:29 +01:00
Laurent Destailleur
84fec7c5c7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
	htdocs/core/class/html.formprojet.class.php
2017-01-24 18:40:01 +01:00
Laurent Destailleur
b1e5d8ce98 FIX Combo list of VAT is wrong on POS 2017-01-24 14:33:49 +01:00
Laurent Destailleur
ecc6cb5596 Fix button at wrong place 2017-01-23 20:38:26 +01:00
Laurent Destailleur
25df6b799a Fix loading lang 2017-01-23 17:36:50 +01:00
Laurent Destailleur
9a59fbada7 Fix missing info admin picto. Fix colspan. 2017-01-23 17:31:39 +01:00
Laurent Destailleur
05582e9586 Sync transifex 2017-01-23 17:31:09 +01:00
Regis Houssin
9dca9e4f8b Fix: travis error - Space found before comma in function call 2017-01-23 13:46:25 +01:00
Regis Houssin
e4eb2d2aaf Fix: explode array result is 0,1,2 and not 1,2,3 2017-01-23 13:36:55 +01:00
Regis Houssin
7980f1c999 Fix: avoid php non-numeric errors 2017-01-23 12:29:05 +01:00
Regis Houssin
0479fdb0a2 Fix: avoid non-numeric error 2017-01-23 12:25:39 +01:00
Regis Houssin
e2e4403869 Fix: avoid numeric errors 2017-01-23 12:20:44 +01:00
Laurent Destailleur
00ea5d3de0 Mising translation 2017-01-23 10:32:14 +01:00
Laurent Destailleur
bc10246d05 Fix bad amount on invoice. Table of supplier discount not yet available. 2017-01-22 23:19:14 +01:00
Laurent Destailleur
aa1ccad714 Fix permission 2017-01-22 23:08:11 +01:00
Laurent Destailleur
b011d6e188 Fix date of invoice in future. 2017-01-22 23:00:40 +01:00
Laurent Destailleur
db220e7af5 FIX Rename api_key into DOLAPIKEY to allow to use it on http header. 2017-01-22 20:55:26 +01:00
Laurent Destailleur
34cf1fdd76 Fix if logo is not defined 2017-01-22 16:07:48 +01:00
Laurent Destailleur
f875597c0b Fix statistics of leave requests (date valid not defined if status is
draft)
2017-01-22 16:03:08 +01:00
Laurent Destailleur
581b61bef1 CSS and look 2017-01-22 15:03:07 +01:00
Laurent Destailleur
433ad9d59d Fix responsive 2017-01-22 13:27:17 +01:00
Laurent Destailleur
66819a34fa Fix several bugs 2017-01-22 13:19:07 +01:00
Laurent Destailleur
b0e9f31474 Fix responsive 2017-01-22 12:43:25 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00