Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
fhenry
7fdf2f3482 Fix for php 5 2013-04-24 23:54:02 +02:00
fhenry
faced82abe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 23:49:49 +02:00
fhenry
4badcf5a75 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-04-24 23:19:22 +02:00
fhenry
cd7f94d515 [ bug #849 ] BUG PGSQL 2013-04-24 23:19:01 +02:00
fhenry
928a1afe18 Fix bug on Extrafield list table type 2013-04-24 21:32:22 +02:00
Laurent Destailleur
4a0c6c425e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-24 19:15:54 +02:00
Laurent Destailleur
00e39a219e Merge pull request #876 from jfefe/test_ui 
Minor interface improvements (theme eldy) : link uderline on hover / bold in array titles
 2013-04-24 10:15:38 -07:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
fhenry
7b1616d0c5 Better management extrafield from list of table 2013-04-24 19:14:03 +02:00
Laurent Destailleur
0301d04fc4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-24 19:01:09 +02:00
Laurent Destailleur
20b9331b3c Fix: W3C 2013-04-24 18:58:01 +02:00
Laurent Destailleur
b2129a519d Merge pull request #875 from grandoc/3.3 
fix undefined offset
 2013-04-24 09:03:04 -07:00
Laurent Destailleur
ac4c236dbc Merge pull request #874 from grandoc/develop 
Develop
 2013-04-24 09:02:51 -07:00
fhenry
5789a5d6e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 17:53:59 +02:00
fhenry
d9551abb70 Fix trad for Extrafield from table 2013-04-24 17:32:08 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
9ce7e44f00 use price method rather than price2num. price are use in all PDF, so it 
should be the same on ODT
 2013-04-24 16:47:15 +02:00
Laurent Destailleur
d3d2ffe43e Qual: A better error management for suse rpm package 2013-04-24 16:16:41 +02:00
Laurent Destailleur
9a2b72f8f8 Compatibility with jmobile 2013-04-24 15:49:43 +02:00
Grand Philippe
026195689b fix undefined offset 2013-04-24 15:22:37 +02:00
Grand Philippe
1200155441 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-24 15:19:13 +02:00
Grand Philippe
d2a718d0e6 fix undefined offset 2013-04-24 15:18:42 +02:00
fhenry
41c8a9aa6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 15:07:03 +02:00
Laurent Destailleur
95f6b576b2 Look: Minor fix 2013-04-24 14:20:23 +02:00
Laurent Destailleur
fb1c306b31 Update nl 2013-04-24 13:59:08 +02:00
jfefe
c17775b9a1 Minor interface improvements (theme eldy) : link uderline on hover / bold in array titles 2013-04-24 13:39:39 +02:00
Laurent Destailleur
bca399623f Fix: finish merge 2013-04-24 12:44:36 +02:00
Laurent Destailleur
f7aa90b3b3 Add user help 2013-04-24 12:43:23 +02:00
Laurent Destailleur
cbf44bf175 Change to be compatible with jmobile 2013-04-24 12:10:04 +02:00
fhenry
d9a2805100 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 08:50:51 +02:00
Laurent Destailleur
a8ea2a9d06 Prepare code for small screens 2013-04-24 04:06:13 +02:00
Laurent Destailleur
d5f3f47782 New: Use div for tabs. 2013-04-24 03:56:13 +02:00
Laurent Destailleur
b3e2050186 Fix: Remove warning 2013-04-23 23:44:49 +02:00
fhenry
bd1b440743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
fhenry
23a7aae084 [ bug #841 ] Erreur compta/index 2013-04-23 14:48:34 +02:00
fhenry
52a1e81147 [ bug #842 ] Erreur SQL Propal 2013-04-23 14:43:32 +02:00
Laurent Destailleur
203d4e3ca8 Prepare database for parameters into boxes 2013-04-23 14:17:04 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock 
fix [ bug #842 ] Erreur SQL Propal
 2013-04-23 14:02:29 +02:00
Laurent Destailleur
dbc2eddcba Prepare for 3.3.2 2013-04-23 12:09:21 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
39d3d1a34e Enhance script to send email to sale representatives 2013-04-23 12:00:31 +02:00
Laurent Destailleur
78a0c7ace2 Fix: log must use the mask defined into setup 2013-04-23 12:00:02 +02:00
fhenry
0513cbe655 Add debug log (dol_syslog) 2013-04-23 11:12:07 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18 Removed warning 2013-04-22 20:45:47 +02:00
Laurent Destailleur
6f5ce77846 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 20:42:25 +02:00
Laurent Destailleur
4e939f558a Restore font weight 2013-04-22 20:41:38 +02:00
Laurent Destailleur
dabd68aba6 Merge pull request #866 from atm-maxime/develop 
Fix : column missing in migration for price by qty
 2013-04-22 11:40:17 -07:00