Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
3bcd506e73 Fix: demo modules list 2013-04-10 23:06:38 +02:00
Laurent Destailleur
5c4c7519fd Merge pull request #823 from defrance69/patch-23
Update admin_extrafields.inc.php
2013-04-10 13:37:58 -07:00
BENKE Charles
e0cb09bd65 Update admin_extrafields.inc.php
$default_value not initialised
new type : sellist
2013-04-10 22:38:45 +03:00
Laurent Destailleur
4d0dd0d56c Fix: Function to generate pdf 2013-04-10 20:50:05 +02:00
Laurent Destailleur
9dd201df10 Fix: Log 2013-04-10 20:47:39 +02:00
Laurent Destailleur
15e86875f3 Fix: sql syntax error 2013-04-10 20:45:38 +02:00
fhenry
98ddd02a32 Qual : PHP Code_Sniffer 2013-04-10 19:55:21 +02:00
Laurent Destailleur
70b7cb1fa3 Fix: Restore suffix 2013-04-10 19:50:54 +02:00
Laurent Destailleur
43d4bb6155 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-10 19:30:51 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Laurent Destailleur
f3adcc311d Qual: Removed useless table 2013-04-10 18:34:19 +02:00
Laurent Destailleur
5197dedc59 Fix: Missing background 2013-04-10 18:33:58 +02:00
Laurent Destailleur
c4d0c4c3e5 Merge pull request #821 from FHenry/3.3
Fix bug : change path of ODT template for commande and propal module
2013-04-10 08:15:57 -07:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
fhenry
5d94b0c576 Fix bug : change path of ODT template for commande and propal module 2013-04-10 16:34:06 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Laurent Destailleur
c174dd9d05 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-10 16:16:12 +02:00
Laurent Destailleur
3d8c312a30 Fix: Uniformize column size
Fix: Use dol_prind_address for addressees
2013-04-10 16:15:35 +02:00
Laurent Destailleur
4f645b0a53 Fix: Bad width 2013-04-10 16:08:38 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
740bc2a656 Fix: filter on all contacts, not just those related to a company 2013-04-10 15:59:54 +02:00
Laurent Destailleur
6739ac4d94 Fix: Restore backward compatibility 2013-04-10 15:53:40 +02:00
Regis Houssin
ef4004c0ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-10 15:42:52 +02:00
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