Commit Graph

40390 Commits

Author SHA1 Message Date
Laurent Destailleur
154a75cc39 Merge pull request #1268 from FHenry/develop
Add NL_nl translation for category contact
2013-10-31 04:38:52 -07:00
Laurent Destailleur
e6ed902c63 Merge pull request #1267 from FHenry/3.4
Add nl_NL margin translation
2013-10-31 04:38:15 -07:00
Laurent Destailleur
ecfa795306 Merge pull request #1270 from grandoc/develop
missing GETPOST
2013-10-31 04:37:46 -07:00
Laurent Destailleur
87369393a8 Merge pull request #1271 from braito4/patch-5
Update list.php
2013-10-31 04:37:12 -07:00
Peter Fontaine
d7ab92c2a7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-dolibarr 2013-10-31 08:32:15 +01:00
Florian Henry
70bbe10f9e Start Task 172 2013-10-31 01:21:09 +01:00
Maxime Kohlhaas
74f30a2ef6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-10-31 01:02:04 +01:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
10cd9619f9 Update doc 2013-10-30 19:09:02 +01:00
Laurent Destailleur
c51ff1d462 New: Add hidden option to disable log handlers. 2013-10-30 19:08:41 +01:00
Christophe Battarel
ba0273ccc4 fix bad rounding on margin calculation and display 2013-10-30 18:17:37 +01:00
Florian Henry
693918d8b6 misspelling 2013-10-30 12:40:00 +01:00
Florian Henry
27e4852a35 upgrade process to change const SOCIETE_DONOTSEARCH_ANYWHERE to
COMPANY_DONOTSEARCH_ANYWHERE
2013-10-30 12:27:36 +01:00
Florian Henry
f512ef344a Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
2013-10-30 12:24:51 +01:00
Laurent Destailleur
b3a0510407 Fix: Allow text input for hour. 2013-10-30 11:57:32 +01:00
Peter Fontaine
6f2f2d588f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-dolibarr 2013-10-30 11:55:34 +01:00
braito4
e89c3fa074 Update list.php
sql error.
2013-10-30 11:51:23 +01:00
Florian Henry
64745ecefe Add function field into webservice contact 2013-10-30 09:52:39 +01:00
Grand Philippe
0ae489aee7 missing GETPOST 2013-10-30 09:34:59 +01:00
Florian Henry
fa5ff00060 Put scroolbar on autocomplete ul/li and not on main windows as before 2013-10-30 09:15:36 +01:00
Florian Henry
df9cf49cfb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-30 09:08:02 +01:00
Florian Henry
55046e2caf Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-10-30 09:07:14 +01:00
Laurent Destailleur
8045f6091f Merge remote-tracking branch 'origin/3.4' into develop 2013-10-29 23:55:20 +01:00
Laurent Destailleur
d6b2d44350 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-10-29 23:51:46 +01:00
Laurent Destailleur
649124e8ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2013-10-29 23:50:25 +01:00
Laurent Destailleur
90ae4d53e4 Add smaller 2013-10-29 23:46:58 +01:00
Laurent Destailleur
f71b47b282 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2013-10-29 23:46:15 +01:00
Laurent Destailleur
a7ed2c1c33 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-29 23:38:58 +01:00
Laurent Destailleur
277fc1a274 Update doc 2013-10-29 23:38:39 +01:00
Laurent Destailleur
5fbb967941 Fix: restart of mysql for opensuse 2013-10-29 22:57:51 +01:00
Laurent Destailleur
5b3ba85669 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
2013-10-29 18:07:12 +01:00
Laurent Destailleur
70342c09b8 Fix: Better management of using ajax for upload form (to solve problem
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
2013-10-29 17:52:13 +01:00
Laurent Destailleur
0a11bf1769 Update doc 2013-10-29 15:14:36 +01:00
Raphaël Doursenaud
207f393253 CRLF fix 2013-10-29 10:12:56 +01:00
Peter Fontaine
3ddb6d1126 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-dolibarr 2013-10-28 15:47:39 +01:00
Laurent Destailleur
b4edbde0c8 Fix: css class name 2013-10-28 13:04:16 +01:00
Peter Fontaine
cb487a5362 no message 2013-10-28 10:12:52 +01:00
Peter Fontaine
bf5d3331f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-dolibarr 2013-10-28 09:31:17 +01:00
Laurent Destailleur
953f638cb4 New: Sort combo list for type of thirdparties. 2013-10-28 02:13:07 +01:00
Laurent Destailleur
93c5720579 New: Add path to installed dir of external modules + Name and web of
module provider.
2013-10-28 01:37:04 +01:00
Florian Henry
ea5619a58a Add NL_nl translation for category contact 2013-10-27 14:31:42 +01:00
Florian Henry
ad2a8d39c5 Add nl_NL margin translation 2013-10-27 13:30:35 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Laurent Destailleur
870f7ada45 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-27 02:27:32 +02:00
Laurent Destailleur
ca95bd67f8 Qual: control of delete usage 2013-10-27 02:23:25 +02:00
Laurent Destailleur
686babd0dc Merge pull request #1265 from FHenry/3.4
Fix bad display IE for checkbox extrafield readonly
2013-10-26 17:15:00 -07:00
Laurent Destailleur
197ae822d4 Merge pull request #1263 from FHenry/develop
Fix list propal and invoice to display customer ref if option is set
2013-10-26 17:13:07 -07:00
Laurent Destailleur
62bedffb49 Fix: Bad class for body 2013-10-27 02:10:53 +02:00
Laurent Destailleur
27e59866b0 Fix: responsive desing of page 2013-10-27 01:08:37 +02:00
Laurent Destailleur
7b2e6a2974 Fix: responsive desing of page 2013-10-27 00:34:25 +02:00