Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
8d1b86db49 Qual: Add method addline 2013-07-10 15:58:07 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Laurent Destailleur
57dbf87d0a Just use print instead of echo, just because echo is not use anuwhere
else.
2013-07-10 15:45:16 +02:00
Maxime Kohlhaas
cfc999a06d Merge 2013-07-10 15:44:53 +02:00
Laurent Destailleur
7ee23a9612 Merge pull request #1085 from csalvador/form_attach_new_file_hook
hook in form_attach_new_file(html.formfile.class.php)
2013-07-10 06:42:37 -07:00
Laurent Destailleur
f2281a4e58 Merge pull request #1086 from FHenry/3.4
remove pgsql warning on date insert
2013-07-10 06:40:31 -07:00
Maxime Kohlhaas
8f72e16444 Remove duplicate code 2013-07-10 15:34:36 +02:00
simnandez
ca406d0980 Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS 2013-07-10 15:34:16 +02:00
simnandez
50395fc8c4 Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS 2013-07-10 15:32:29 +02:00
Cédric Salvador
9619b09e37 rewriting to fit the new way to use hooks 2013-07-10 15:30:49 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Florian Henry
729cef3eb4 Qual: Return id of order creates instead of 1 with method
createFromProposal
2013-07-10 13:32:42 +02:00
Florian Henry
44cd024f89 Fix bug on from_confrim using ajax and radio button question type 2013-07-10 13:10:32 +02:00
Florian Henry
b9bfccd0e2 fix pgsql warning date 2013-07-10 10:35:10 +02:00
Laurent Destailleur
a60cc916f6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-07-10 10:34:56 +02:00
Florian Henry
4aa966f7ad remove pgsql warning on date insert 2013-07-10 10:30:33 +02:00
Laurent Destailleur
f94f516a12 Clean code for managing alternate root dirs. 2013-07-09 23:46:31 +02:00
Laurent Destailleur
fbf6f150bc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-09 21:41:05 +02:00
Laurent Destailleur
f67e52f42a Start to clean hook code 2013-07-09 21:40:45 +02:00
Laurent Destailleur
1bff25bf28 Start to clean hookmanager code. 2013-07-09 21:33:45 +02:00
Laurent Destailleur
d51be1ec9d Merge pull request #1084 from csalvador/dol_buildpath
fix dol_buildpath failing when processing path such as file.php?id=__ID_...
2013-07-09 12:16:48 -07:00
Laurent Destailleur
752bc0ccff Work on tool for performance advice. 2013-07-09 18:45:14 +02:00
Cédric Salvador
03ad72a1fa fix dol_buildpath failing when processing path such as file.php?id=__ID__ 2013-07-09 18:14:50 +02:00
Cédric Salvador
2fc07d05e9 hook in form_attach_new_file(html.formfile.class.php) 2013-07-09 18:12:43 +02:00
Laurent Destailleur
f4428c8a8a Fix: Bad link 2013-07-09 15:27:06 +02:00
Laurent Destailleur
fee1682671 Add missing modules 2013-07-09 15:24:50 +02:00
Laurent Destailleur
0ca4e4ffe8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-09 13:51:27 +02:00
Laurent Destailleur
5706779c8b New: Add a page on performance advice 2013-07-09 13:50:20 +02:00
Laurent Destailleur
0b28ab9dde Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-09 00:36:12 +02:00
Laurent Destailleur
aa628fb47a Fix help 2013-07-09 00:35:55 +02:00
Laurent Destailleur
c1cb5e9bff Fix geoipmaxmind module 2013-07-09 00:19:58 +02:00
Laurent Destailleur
affff4934b Merge pull request #1081 from FHenry/3.4
[ bug #972 ] Auto completion contact field do not take account the min
2013-07-08 12:09:50 -07:00
Florian Henry
95606dde04 Just update space into change log 2013-07-08 14:54:55 +02:00
Florian Henry
3db195cb48 [ bug #971 ] html.form.class.php select_contact with autocomplete do not
exclude id from exclude array
2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3 [ bug #972 ] Auto completion contact field do not take account the min
caract number before search
2013-07-08 12:47:07 +02:00
Laurent Destailleur
b26250c45a Fix when alt path is full url instead of relative. 2013-07-07 23:37:56 +02:00
Laurent Destailleur
8f71e5fda2 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
2013-07-07 23:25:03 +02:00
Laurent Destailleur
05461c47cc Fix: vat rate for slovenia 2013-07-07 23:22:00 +02:00
Laurent Destailleur
a687cc429c Update doc for 3.4 2013-07-07 13:35:29 +02:00
Laurent Destailleur
b16689e8b7 Prepare 3.4 2013-07-07 13:32:45 +02:00
Laurent Destailleur
0de1fe893a Prepare 3.4 2013-07-07 13:30:30 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
cbc0570bc3 Update exemple 2013-07-07 03:33:10 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Laurent Destailleur
9be6dd8b17 Fix: Missing load 2013-07-05 23:10:47 +02:00
Laurent Destailleur
e83e44a012 Update doc 2013-07-05 21:57:51 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
2013-07-05 21:56:54 +02:00
Laurent Destailleur
1252820481 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-05 21:18:00 +02:00
Laurent Destailleur
e7982120df Fix bug with php 5.2.4 2013-07-05 21:17:35 +02:00