Commit Graph

47487 Commits

Author SHA1 Message Date
Laurent Destailleur
b99d2a8276 Merge pull request #2819 from GPCsolutions/typehinting
[Qual] Typehinting
2015-05-12 22:34:06 +02:00
Raphaël Doursenaud
3b9388e57f Added typehinting to resultsets in database drivers 2015-05-12 19:51:41 +02:00
Raphaël Doursenaud
6558c0f1f2 Removed a bunch of unused variables 2015-05-12 19:47:15 +02:00
Raphaël Doursenaud
3fdc4ca5e0 Better type hinting for the SQLite3 database driver 2015-05-12 19:45:14 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
70d36dd1e3 Better type hinting for the SQLite database driver 2015-05-12 19:30:04 +02:00
Raphaël Doursenaud
67641280a4 Fixed parameter types 2015-05-12 19:16:29 +02:00
Raphaël Doursenaud
1fdff27184 Fixed type hintings 2015-05-12 19:11:12 +02:00
Raphaël Doursenaud
053f6ae494 [Qual] Fixed missing return statements 2015-05-12 19:10:47 +02:00
Raphaël Doursenaud
27d52cf2b0 Better type hinting for DoliDB 2015-05-12 19:01:01 +02:00
Raphaël Doursenaud
ccd14c8305 Better type hinting and code structure for the PgSQL database driver 2015-05-12 18:31:12 +02:00
Raphaël Doursenaud
4a01cf1256 Better type hinting for the Database interface 2015-05-12 18:30:16 +02:00
Raphaël Doursenaud
7231ca890a Better type hinting for the MSSQL database driver 2015-05-12 18:13:24 +02:00
Raphaël Doursenaud
6e6e63db50 Better type hinting and code structure for the MySQLi database driver 2015-05-12 17:56:01 +02:00
Raphaël Doursenaud
04f5e73557 Better type hinting for MySQL database driver 2015-05-12 17:16:46 +02:00
jfefe
125a34cb34 Fix PHPCS 2015-05-12 16:42:35 +02:00
jfefe
d079bc1507 Add comment to ignore PHPCs error due to restler framework 2015-05-12 16:35:05 +02:00
Laurent Destailleur
a94121a8c5 Add field to define picto to use for status 2015-05-12 09:42:14 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
2015-05-12 00:09:03 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
2015-05-11 23:53:38 +02:00
Laurent Destailleur
2a486f471b Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/product/class/product.class.php
2015-05-11 23:39:45 +02:00
Laurent Destailleur
ad993f246d Merge pull request #2795 from hregis/3.7
Fix: add $object for use with triggers
2015-05-11 23:36:43 +02:00
Laurent Destailleur
c59e365950 Merge pull request #2812 from bafbes/patch-1
Update html.formfile.class.php
2015-05-11 23:08:40 +02:00
Laurent Destailleur
acd7e7502b Merge pull request #2808 from aspangaro/develop-md
Theme Md: Change font & divide by two the border-radius
2015-05-11 23:04:11 +02:00
Laurent Destailleur
b2fa603f46 Merge pull request #2794 from hregis/develop_origin
Fix: add $object for use with triggers
2015-05-11 23:02:41 +02:00
Laurent Destailleur
5f594d55ac Merge pull request #2805 from marcosgdf/bug-2758
FIX #2758 Product::update sets product note to "null" when $prod->note is null
2015-05-11 23:00:25 +02:00
Juanjo Menent
200b3b167e Merge pull request #2811 from bafbes/patch-2
Update list.php and core/class/html.formfile.class.php
2015-05-11 20:16:17 +02:00
Juanjo Menent
23bd8f50df Merge pull request #2809 from atm-maxime/develop
New : Signature area on proposal PDF
2015-05-11 20:09:54 +02:00
Juanjo Menent
97b9e87773 Merge pull request #2806 from marcosgdf/revert-25812f0
Revert 25812f0
2015-05-11 20:08:15 +02:00
Bahfir Abbes
280c6a04af Update list.php
Correct erroneous links to supplier invoice documents in list
2015-05-11 18:03:26 +01:00
Bahfir Abbes
3e4fcd1ac7 Update html.formfile.class.php
in order to correct document lists in list of supplier invoices
2015-05-11 17:51:54 +01:00
Laurent Destailleur
f275145bd2 FIX We did a test on a permission to export contract when permission did
not exists.
2015-05-10 23:46:34 +02:00
Laurent Destailleur
1714b8bdbe Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-10 23:44:02 +02:00
Laurent Destailleur
8b596d7a69 Fix css missing 2015-05-10 23:43:18 +02:00
Laurent Destailleur
a503d90982 FIX We did a test on a permission to export contract when permission did
not exists.
2015-05-10 23:37:04 +02:00
Laurent Destailleur
5bac040a9a Enhance prototype for select 2015-05-10 21:21:29 +02:00
Maxime Kohlhaas
443badfbcf New : Signature area on proposal PDF 2015-05-10 17:39:57 +02:00
aspangaro
fece843091 Theme Md: Change font & divide by two the border-radius 2015-05-10 15:08:53 +02:00
Marcos García de La Fuente
fb01f89e95 Unwanted deletion 2015-05-10 12:44:36 +02:00
Marcos García de La Fuente
9988b1ad4e Revert 25812f0 2015-05-10 12:43:21 +02:00
Marcos García de La Fuente
f6616deef3 Removed debugging function 2015-05-10 01:28:40 +02:00
Marcos García de La Fuente
f8e8b39ff2 FIX #2758 Product::update sets product note to "null" when $prod->note is null 2015-05-10 01:27:28 +02:00
Juanjo Menent
39b932d37e Merge pull request #2804 from simnandez/develop
Code fixes
2015-05-09 14:47:15 +02:00
Juanjo Menent
97ad7ca88b Code fixes 2015-05-09 14:23:26 +02:00
Juanjo Menent
ce1769d2c5 Merge pull request #2803 from simnandez/develop
Code fixes
2015-05-09 13:59:11 +02:00
Juanjo Menent
e07cebd50b Merge pull request #2793 from GPCsolutions/htmlfixes
HTML fixes
2015-05-09 13:58:43 +02:00
Juanjo Menent
27035b42b0 Merge pull request #2788 from GPCsolutions/testaccess
Change low level access verification to a better high level one
2015-05-09 13:55:17 +02:00
Juanjo Menent
d4e8e58e54 Code fixes 2015-05-09 13:25:40 +02:00
Juanjo Menent
577c872aaf Code fixes 2015-05-07 20:44:31 +02:00
Juanjo Menent
b7228e191c Merge pull request #2801 from FHenry/3.6
FIX : [ bug #1926 ] [contract] Wrong Rights Checked
2015-05-07 20:21:05 +02:00