Commit Graph

37812 Commits

Author SHA1 Message Date
simnandez
ca406d0980 Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS 2013-07-10 15:34:16 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +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
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
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
c1cb5e9bff Fix geoipmaxmind module 2013-07-09 00:19:58 +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
Laurent Destailleur
879cfbbdf3 Merge pull request #1080 from defrance69/patch-4
Update modFacture.class.php
2013-07-05 05:59:19 -07:00
Laurent Destailleur
df22c8b8ee Merge pull request #1079 from FHenry/3.4
Reset demo webservice to NORUN
2013-07-05 05:58:12 -07:00
Laurent Destailleur
2cdf621b75 New: Provide relativepath as parameter 2013-07-05 14:55:24 +02:00
BENKE Charles
45e32ca3a5 Update modFacture.class.php
add 'accountancy_code_sell' to the customer invoice export list
2013-07-05 12:14:27 +02:00
Laurent Destailleur
529a58cc9d New: Add advice into info help 2013-07-05 12:04:55 +02:00
Florian Henry
1e089ef74a Reset demo webservice to NORUN 2013-07-05 09:19:56 +02:00
Laurent Destailleur
7cb8809669 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-04 00:12:23 +02:00
Laurent Destailleur
eef039e02f New: [ task #286 ] Enhance rounding function of prices to allow round of
sum instead of sum of rounding
2013-07-04 00:11:40 +02:00
simnandez
c474929caa Trad: Load contracts lang for stats panel 2013-07-03 16:51:06 +02:00
simnandez
df26037e9d Trad: Load contracts lang for stats panel 2013-07-03 16:49:54 +02:00
simnandez
66ce0582a1 Trad: Fix missing = into es_ES admin.lang 2013-07-03 16:42:53 +02:00
Laurent Destailleur
3004b5fdf6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-03 16:12:36 +02:00
Laurent Destailleur
c1abd26a60 Fix: Package name for wheezy 2013-07-03 16:12:17 +02:00
Regis Houssin
7e70d935b6 Fix: change for use url of image 2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb Fix: change for use url of image 2013-07-03 16:06:42 +02:00
Laurent Destailleur
c83e60b471 Merge pull request #1077 from defrance69/patch-3
Update fiche.php
2013-07-03 06:48:20 -07:00
BENKE Charles
94772dbe30 Update fiche.php
change restricted area, too much agressive
2013-07-03 15:25:22 +02:00
simnandez
6180b6c0a6 Fix: Amarok Tab visu. 2013-07-03 12:16:32 +02:00
simnandez
64a04ef150 Trad: Add missing trans before 3.4 final release 2013-07-03 12:14:37 +02:00
Laurent Destailleur
33ed654745 New: Upgrade jquery flot library to 0.8.1 2013-07-03 03:40:59 +02:00
Laurent Destailleur
d96719c948 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-02 21:55:41 +02:00
Laurent Destailleur
6f5a918373 New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page.
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
2013-07-02 21:53:34 +02:00
simnandez
c9fd070bba Fix: Amarok Tab visu. 2013-07-02 18:53:42 +02:00
Laurent Destailleur
8d7a058a67 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-02 09:59:04 +02:00