2
0
forked from Wavyzz/dolibarr
Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
301187a117 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
2013-09-11 21:54:57 +02:00
Laurent Destailleur
d6c35c1ee7 Fix: Opensource rules violation (sources must be included with lib) 2013-09-11 21:39:33 +02:00
Raphaël Doursenaud
875f9d55c7 Fixed tinyint for PostgreSQL in a more generic way 2013-09-11 17:34:35 +02:00
Raphaël Doursenaud
3c08ca5b71 Fixed SQL install script for PostgreSQL 2013-09-11 17:12:51 +02:00
simnandez
eb44f272e3 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-11 17:10:06 +02:00
simnandez
a0ce8974b5 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-11 16:44:34 +02:00
Laurent Destailleur
b06b2e2119 Merge pull request #1231 from GPCsolutions/dolidb-installer
Fixed installer with DoliDB abstract class
2013-09-11 07:29:23 -07:00
Raphaël Doursenaud
cbb763ab3f Fixed installer with DoliDB abstract class 2013-09-11 15:48:25 +02:00
Laurent Destailleur
74f8a19134 Qual: Make code simpler 2013-09-11 15:17:31 +02:00
Laurent Destailleur
4b2ee84ede Merge pull request #1230 from GPCsolutions/deprecated-5.5
Deprecated in PHP 5.5
2013-09-11 06:09:26 -07:00
Raphaël Doursenaud
07b321b6c3 Replaced PHP 5.5 deprecated call in external library 2013-09-11 15:00:35 +02:00
Raphaël Doursenaud
9636e1aafc Replaced PHP 5.5 deprecated calls 2013-09-11 14:48:02 +02:00
Laurent Destailleur
30d2af26f8 Fix: phpunit test 2013-09-11 14:26:25 +02:00
Laurent Destailleur
4362771e01 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-11 14:21:23 +02:00
Laurent Destailleur
fa0825885a Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-09-11 14:20:36 +02:00
Laurent Destailleur
0bb18cb05c New: Can use tag {mm} before {yy} even when there is a reset into
numbering masks.
Qual: Enhance phpunit tests to include this case.
2013-09-11 14:18:56 +02:00
Laurent Destailleur
50ce834dd0 [ bug #1049 ] agenda isn't save preferences 2013-09-11 11:08:38 +02:00
Laurent Destailleur
21d9aa2fe4 Fix: [ bug #1054 ] Customer Invoice Numbering failure 2013-09-11 11:01:02 +02:00
Laurent Destailleur
c3fa57039a Fix: Report only checkstyle errors into travis CI (not warning) 2013-09-11 10:38:28 +02:00
Laurent Destailleur
eb10093ae8 Fix: Regression detected by phpunit 2013-09-11 10:05:01 +02:00
Laurent Destailleur
92e1536d8f Fix: checkstyle errors 2013-09-11 09:56:20 +02:00
Laurent Destailleur
e361566eae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-11 09:40:23 +02:00
Laurent Destailleur
fd17280521 Removed all checkstyle errors 2013-09-11 09:40:00 +02:00
simnandez
418457e945 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-11 09:19:25 +02:00
simnandez
699414cab7 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 18:45:16 +02:00
simnandez
bc0356db1f [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 18:32:03 +02:00
simnandez
c1c423dcac [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 17:49:36 +02:00
simnandez
634f70a74d New: [ task #1060 ] Register fields localtax(1|2)_type into details
tables. Invoices
2013-09-10 17:07:38 +02:00
Cédric Salvador
13e86e9b0d Added a field to group by to avoid error with mysql strict mode 2013-09-10 16:45:05 +02:00
Laurent Destailleur
f195d59c9c Try to fix false positive with dolgraph 2013-09-10 16:12:20 +02:00
Laurent Destailleur
21602b34a9 Try to fix false positive with dolgraph 2013-09-10 15:56:40 +02:00
Laurent Destailleur
7d2109f8e8 Try to fix false positive with dolgraph 2013-09-10 15:50:05 +02:00
Laurent Destailleur
e467d63a94 Try to fix false positive 2013-09-10 15:45:36 +02:00
Laurent Destailleur
9314859ead More log to find bug 2013-09-10 15:21:56 +02:00
Laurent Destailleur
345aa33efd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-10 14:20:15 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Laurent Destailleur
38d3746c11 Merge pull request #1226 from GPCsolutions/dolidb
Added an abstract DolibDB class
2013-09-10 03:36:34 -07:00
Raphaël Doursenaud
5426db63ff Added an abstract DolibDB class 2013-09-10 12:29:55 +02:00
Laurent Destailleur
cb95355d37 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-10 12:27:25 +02:00
Laurent Destailleur
0cb8e2e710 Removed warnings 2013-09-10 12:26:48 +02:00
Laurent Destailleur
fa5fea68b0 Removed warnings 2013-09-10 12:25:42 +02:00
Laurent Destailleur
c02b0f2381 Removed warnings 2013-09-10 12:25:02 +02:00
Laurent Destailleur
ee65a193c2 Try to fix a warning 2013-09-10 12:11:55 +02:00
Laurent Destailleur
943f8108ab Fix a rule 2013-09-10 12:11:08 +02:00
Laurent Destailleur
376a7e2e3c Remove checkstyle outpout that is too verbose.
USe instead option -s
Disable a rule
2013-09-10 11:59:15 +02:00
Laurent Destailleur
2db0a56b17 Merge pull request #1225 from jfefe/fix_ws_order
Fix : missing lib / bad property name in order webservice
2013-09-10 02:44:22 -07:00
Laurent Destailleur
598f6883a2 Doc comments 2013-09-10 11:39:20 +02:00
jfefe
5abbee02c8 Fix : missing lib / bad property name in order webservice 2013-09-10 11:23:36 +02:00
simnandez
af89a794a0 Fix: [ bug #1061 ] Bad info shipped products 2013-09-10 11:06:15 +02:00
simnandez
43beb38c9b Fix: [ bug #1061 ] Bad info shipped products 2013-09-10 11:04:36 +02:00