lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,867 Commits 43 Branches 150 Tags 886 MiB
95ea3a01df
Commit Graph

37867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
b152e58793 Fix: change for experimental encyption 2013-04-10 15:42:21 +02:00
Regis Houssin
b80d4874e3 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2013-04-10 15:34:51 +02:00
Regis Houssin
057365b69e Fix: change for experimental encryption 2013-04-10 15:33:03 +02:00
Regis Houssin
eb78de1981 Merge pull request #820 from FHenry/3.3 
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
 2013-04-10 06:20:06 -07:00
fhenry
38e30836a5 Fix bug with multicompany (SYSLOG_FILE on wrong entity) 2013-04-10 15:08:03 +02:00
Laurent Destailleur
72aec6aa60 Better translation 2013-04-10 13:30:54 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Regis Houssin
2c51b51a88 Fix: security 2013-04-10 11:56:19 +02:00
Laurent Destailleur
bc1469ff29 Fix: More complete function 2013-04-10 11:03:24 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
Laurent Destailleur
20e9eb5f8f Fix: syntax error 2013-04-10 10:40:59 +02:00
Laurent Destailleur
7f6fa0bf0f Fix: Enhance detection of html 2013-04-10 10:40:35 +02:00
Laurent Destailleur
e79d0f50d0 Fix: Regression 2013-04-10 00:08:55 +02:00
Laurent Destailleur
af6f075b5c Qual: Better error management. 
Qual: Uniformize code for canvas
 2013-04-09 23:56:52 +02:00
Laurent Destailleur
cf52cbfab5 Fix: Better error management 2013-04-09 23:46:38 +02:00
Laurent Destailleur
6a519cd88c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-09 23:06:18 +02:00
Laurent Destailleur
538194f435 New: Add module opensurvey. Final. Test are welcome. 2013-04-09 23:05:50 +02:00
Laurent Destailleur
a4b56708e9 Better error management 2013-04-09 23:04:59 +02:00
Laurent Destailleur
607dc9caa7 Merge pull request #819 from FHenry/develop 
Fix : admin ODT doctemplate path commande/project
 2013-04-09 13:25:02 -07:00
fhenry
2ca18ace30 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-09 21:58:39 +02:00
fhenry
04e933c40f Fix : admin ODT doctemplate path commande/project 2013-04-09 21:58:25 +02:00
Laurent Destailleur
2ab5c2029d Merge pull request #817 from grandoc/develop 
add supplier invoice extrafields and some fixes
 2013-04-09 12:21:26 -07:00
Laurent Destailleur
fd9c8568dd Merge pull request #818 from FHenry/develop 
[ task #811 ] Uniformanize note field
 2013-04-09 12:20:29 -07:00
frederic34
61b4305949 Merge remote-tracking branch 'upstream/develop' into develop 2013-04-09 17:33:09 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
b28c35740b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-09 16:06:34 +02:00
Laurent Destailleur
32f916e908 Qual: Add a test on not valid parameters 2013-04-09 16:06:00 +02:00
Grand Philippe
c6106e1a8c fix: Champ e.fk_expedition_methode inconnu dans field list 2013-04-09 12:03:49 +02:00
Grand Philippe
f4e58d71ed add supplier invoice extrafields and some fixes 2013-04-09 09:38:25 +02:00
Laurent Destailleur
7b8be3eb87 Removed deprecated and not working code. 2013-04-09 01:29:29 +02:00
Laurent Destailleur
328801f455 Hide upload on smartphones 2013-04-09 01:27:41 +02:00
Laurent Destailleur
00eafa1cf2 Optimie for small screen 2013-04-09 01:25:16 +02:00
Laurent Destailleur
f17ba4814e Merge pull request #816 from FHenry/3.3 
Fix [ bug #810 ] Cannot update ODT template path
 2013-04-08 14:28:51 -07:00
Laurent Destailleur
bba123c6ef Merge pull request #815 from FHenry/develop 
Fix bug on ODT template path for order and projects
 2013-04-08 14:27:28 -07:00
Laurent Destailleur
898a3891e8 Merge pull request #814 from grandoc/develop 
fix: wrong url
 2013-04-08 14:26:15 -07:00
Grand Philippe
5b5b57d4e0 some fixes for supplier orders extrafields 2013-04-08 23:20:35 +02:00
Laurent Destailleur
7d2b11aff5 Qual: Remove a deprecated page, replaced by a more direct combo box. 2013-04-08 19:26:45 +02:00
fhenry
98aaec18a7 Fix [ bug #810 ] Cannot update ODT template path 2013-04-08 18:08:38 +02:00
fhenry
6379b74099 Fix bug on ODT template path for order and projects 2013-04-08 18:02:12 +02:00
Grand Philippe
832fa1fb31 prepair for insert ExtraFields 2013-04-08 17:46:01 +02:00
Laurent Destailleur
c6b66a9f4a Normalize code 2013-04-08 17:42:24 +02:00
Grand Philippe
e54056b805 prepair for insert ExtraFields 2013-04-08 17:39:32 +02:00
Grand Philippe
fbe5947bc2 prepair for insert ExtraFields 2013-04-08 17:17:13 +02:00
Grand Philippe
d1ac79d9ef Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-04-08 16:22:03 +02:00
Grand Philippe
e21e08717e normalize code 2013-04-08 16:06:57 +02:00
Grand Philippe
ea077e959b normalize code 2013-04-08 14:57:06 +02:00
frederic34
9099fe9461 Merge remote-tracking branch 'upstream/develop' into develop 2013-04-08 14:24:25 +02:00
Grand Philippe
d7f2c9c480 some fixes for missing names 2013-04-08 14:21:42 +02:00
Grand Philippe
707ef0f378 some fixes for missing names 2013-04-08 14:12:46 +02:00