Commit Graph

40847 Commits

Author SHA1 Message Date
Raphaël Doursenaud
64fbefdb7c Database: factorized ifsql() 2014-03-15 05:55:02 +01:00
Raphaël Doursenaud
eb86abff94 Database: factorized jdate() 2014-03-15 05:54:51 +01:00
Laurent Destailleur
1d268c2e86 Merge pull request #1469 from atm-maxime/develop
Fix bug 1298 : category nav on member
2014-03-15 00:33:44 +01:00
Laurent Destailleur
97b65c2456 Merge pull request #1470 from tiaris/develop
correction erreur sql update url = null
2014-03-15 00:02:17 +01:00
Maxime Kohlhaas
3131b92988 Fix bug 1293 : numbering failed 2014-03-14 23:18:46 +01:00
jean
9ccf99ab4a correction erreur sql update url = null 2014-03-14 23:04:27 +01:00
Maxime Kohlhaas
b9fbdffab2 Fix bug 1298 : category nav on member
modified:   htdocs/categories/categorie.php
2014-03-14 22:56:54 +01:00
Laurent Destailleur
32364ac18b Move skype module from experimental to stable. 2014-03-14 15:26:26 +01:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +01:00
Laurent Destailleur
aab4800f87 Fix: sql syntax error with pgsql 2014-03-14 12:50:45 +01:00
Laurent Destailleur
bb3632e90c Fix: Pb with new ckeditor. 2014-03-13 12:45:20 +01:00
Laurent Destailleur
f1b05dd3c2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-13 12:37:39 +01:00
Laurent Destailleur
6cec011df6 New: Add manager name (ceo, director, president...) into main company
information page.
2014-03-13 12:22:53 +01:00
Laurent Destailleur
743b0f1834 Merge pull request #1458 from KreizIT/dluo_step4
Dluo step4
2014-03-13 11:57:06 +01:00
Laurent Destailleur
1b85f83dbb Merge pull request #1466 from marcosgdf/minor
Minor style and translation corrections
2014-03-13 11:53:52 +01:00
Laurent Destailleur
813f55e50b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-13 11:38:48 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
3c842f9b6f New: Add barcode fields into user database. 2014-03-13 09:11:14 +01:00
Laurent Destailleur
07ac9d3922 Add example for basic authent 2014-03-12 15:19:49 +01:00
Laurent Destailleur
dd7970b549 Fix: Regression, so introduce option to restore old behaviour. 2014-03-12 12:57:26 +01:00
Laurent Destailleur
e76f2170b3 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:49:11 +01:00
Laurent Destailleur
4a983811d0 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:43:31 +01:00
Laurent Destailleur
ded5d47afc Fix: multilangs array was not loaded. 2014-03-12 01:21:18 +01:00
Laurent Destailleur
29e48612c1 Separator is space 2014-03-11 23:51:00 +01:00
Laurent Destailleur
7684e9e4f7 Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys SeparatorXXX
Fix: Add PHPUnit test to check main.lang files does not contains rubish
values for keys FormatDateShortJaxaXXX
2014-03-11 23:39:26 +01:00
Laurent Destailleur
241ae7a4d1 Fix: Miscellaneous bugs on tasks management
Conflicts:
	htdocs/core/lib/project.lib.php
2014-03-11 20:53:47 +01:00
Laurent Destailleur
2740886711 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-11 20:38:57 +01:00
Laurent Destailleur
afca98323b Fix: Miscellaneous bugs on tasks management 2014-03-11 20:38:29 +01:00
Laurent Destailleur
4acf721c8c Merge pull request #1451 from KreizIT/dluo_step3
Batch number management Step 3
2014-03-11 15:54:23 +01:00
Laurent Destailleur
0c321a2a9b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-11 15:50:32 +01:00
Marcos García de La Fuente
735d30a7d3 Corrected features supported tooltip style in livraison tab 2014-03-11 13:20:52 +01:00
Marcos García de La Fuente
cc95163064 Added missing preview column for donations module 2014-03-11 13:20:32 +01:00
Marcos García de La Fuente
b80c93d277 Added missing info tooltip for project document models 2014-03-11 13:15:14 +01:00
Laurent Destailleur
9a40894423 Fix: translation 2014-03-11 13:14:40 +01:00
Marcos García de La Fuente
08465c0e40 Adapted bookmark module admin page to 3.5 style 2014-03-11 13:04:02 +01:00
Marcos García de La Fuente
42622fc7c4 Changed agenda module configuration page 2014-03-11 12:51:37 +01:00
Marcos García de La Fuente
0f0228ca5a Changed order module configuration page 2014-03-11 12:47:08 +01:00
Marcos García de La Fuente
31afd56897 Changed supplier module configuration page 2014-03-11 12:46:54 +01:00
Marcos García de La Fuente
6419cadde1 Corrected Contract extrafield admin page 2014-03-11 12:46:12 +01:00
Marcos García de La Fuente
8bc273298e Corrected proposals extrafield admin page translation 2014-03-11 12:38:11 +01:00
Marcos García de La Fuente
960bea2d39 Corrected admin page style of some modules 2014-03-11 12:02:44 +01:00
Laurent Destailleur
8d081525ae Merge pull request #1464 from marcosgdf/changelog
Updated changelog
2014-03-11 11:55:08 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error
Corrected Unknown error message typo
2014-03-11 11:54:08 +01:00
Laurent Destailleur
5ee17a2f14 Merge pull request #1460 from atm-gauthier/3.5
error on ajax_constantonoff function
2014-03-11 11:53:44 +01:00
Marcos García de La Fuente
1d357ec2f9 Removed odd tabs from some modules 2014-03-11 11:53:22 +01:00
Laurent Destailleur
814f6b2b90 Merge pull request #1459 from open-minds/patch-1
Fix JavaScript date format in portuguese (Brazil) language file
2014-03-11 11:52:43 +01:00
Laurent Destailleur
6efe28d5c8 Merge pull request #1457 from aspangaro/develop-salary
Add salary payment in tax module
2014-03-11 11:49:28 +01:00
Laurent Destailleur
7c6dbf72b0 Merge pull request #1456 from miicha/patch-1
I validated the pr but has said by marcosgdf, to not loose it, you must fix translation from web interface at https://www.transifex.com/projects/p/dolibarr/
2014-03-11 11:47:20 +01:00
Laurent Destailleur
324402be0d Merge pull request #1465 from marcosgdf/bug-1295
Fixed bug 1295: Error when creating an agenda extrafield with a number as reference
2014-03-11 11:45:50 +01:00
Marcos García de La Fuente
96143ff4a7 Added missing translation keys 2014-03-11 11:41:19 +01:00