Commit Graph

54672 Commits

Author SHA1 Message Date
Laurent Destailleur
dfcd72399a Missing translation 2016-03-17 11:37:07 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Regis Houssin
d2d38f58bf Fix: beware with merges in conflict !! 2016-03-17 09:22:12 +01:00
philippe grand
a196a76132 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-17 09:21:32 +01:00
fmarcet
a1bc5dcc31 FIX: Not showing sellprice properly on product list 2016-03-16 16:35:07 +01:00
fmarcet
ad942afbf1 FIX: Not showing sellprice properly on product list 2016-03-16 16:30:59 +01:00
Laurent Destailleur
eb3ffb30c5 Add mongolian language 2016-03-16 11:29:56 +01:00
Laurent Destailleur
6269503888 Add es_EC and es_PA language 2016-03-16 11:23:00 +01:00
Laurent Destailleur
7528af5569 warning moved into info 2016-03-16 11:18:23 +01:00
jtisseau
969893a5b1 Adds multilanguage translations for MAIN_MAIL_EMAIL_STARTTLS
Adds the translations for all languages having the MAIN_MAIL_EMAIL_TLS
const defined. It's just a copy of this last one changing the "(SSL)" by
"(STARTTLS)".
2016-03-16 02:23:06 +01:00
jtisseau
a98e19a143 Adds a STARTTLS option
Adds a STARTTLS authentification option. This is used by Microsoft
Hotmail and Exchange. This commit includes a new constant named
MAIN_MAIL_EMAIL_STARTTLS, a view and edit view for it and the edit
action needed to modify value in DB. It also updates the js function
initFields to make it behave like the standard TLS option and adds two
jQuery function respectively to set TSL off when STARTTLS is selected
and to set STARTTLS off when TLS is selected. Unselecting one of those
won"t select the other.
2016-03-16 02:09:55 +01:00
jtisseau
d7b0e41271 Added the STARTTLS connection mode
Adds the STARTTLS connection mode in function _server_authenticate. It's
use by Microsoft Hotmail and Exchange servers. I use the
MAIN_MAIL_EMAIL_STARTTLS const introduced in admins/mails.php retrieved
from the $conf object which is not used anywhere else in the file so it
may not be the right way to do it. Maybe this value should be passed in
constructor but it would then imply more changes around multiple files
calling smtps class.
2016-03-16 01:54:45 +01:00
Laurent Destailleur
1ded08abef FIX When using option Price per level, when adding a predefined product,
the vat for customer was not correctly set.
2016-03-15 21:02:45 +01:00
Laurent Destailleur
0f65251615 Missing class fielddeliverydelay 2016-03-15 19:38:01 +01:00
Florian HENRY
781059bbb7 add missing lib 2016-03-15 11:59:43 +01:00
Florian HENRY
28391a4e4d Last version of JQuery 1.12 and DataTables Componenent with working
export Excel,CVS,PDF, etc..
2016-03-15 11:57:53 +01:00
Drosis Nikos
610249068d Fix syntax
SQL error when ordering product list
2016-03-15 12:48:46 +02:00
Alexis Algoud
19d7577267 FIX Bad function name call on delete 2016-03-15 11:14:51 +01:00
philippe grand
ac1b4a90de Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-15 10:24:01 +01:00
Florian HENRY
72b9b9876f travis 2016-03-15 10:15:45 +01:00
Florian HENRY
6fd218c9aa accoutancy 2016-03-15 09:01:02 +01:00
Florian HENRY
c380faacce Accountancy 2016-03-15 08:58:53 +01:00
aspangaro
4167663491 Fix: 3.9 Problem of rowspan in edit mode 2016-03-15 06:53:17 +01:00
Laurent Destailleur
ed9cd71eac css enhancement 2016-03-15 00:54:55 +01:00
Laurent Destailleur
dae41e6dd3 FIX Only active users are visible into agenda view "per user" 2016-03-15 00:54:45 +01:00
Laurent Destailleur
77ae5c668a Can see rest of available leaves request in read only mode if we don't
have permission to edit.
2016-03-14 21:31:22 +01:00
Laurent Destailleur
d4c6c4c140 NEW Holiday is a RH module. All RH module provides by default visilibity
on users of its hierarchy.
2016-03-14 21:22:49 +01:00
Laurent Destailleur
12bb3932d0 NEW Add filter on a keyword, status and nature into list of modules 2016-03-14 19:40:52 +01:00
fappels
437470c3d9 subprice should be unit price without tax 2016-03-14 17:27:12 +01:00
fappels
c16efe06e8 Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop 2016-03-14 16:19:49 +01:00
Laurent Destailleur
77e4fb1883 Fix style 2016-03-14 16:01:27 +01:00
Laurent Destailleur
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +01:00
Laurent Destailleur
76c1af0e65 Fix typo 2016-03-13 23:43:31 +01:00
Laurent Destailleur
619ebf9a3e Enhance css of search fields 2016-03-13 20:38:16 +01:00
Laurent Destailleur
77c81397ea Version 3.9 final 3.9.0 2016-03-13 20:17:49 +01:00
abb
d35f728fad added handle to trigger FICHINTER_ADD_CONTACT in notify module 2016-03-13 19:58:39 +01:00
abb
42eba7270d new:constant FICHINTER_WITHOUT_DURATION to handle interventions without duration in lines
Conflicts:
	htdocs/fichinter/card.php
2016-03-13 19:49:30 +01:00
Laurent Destailleur
5ce7e70097 Clean css 2016-03-13 14:39:41 +01:00
Laurent Destailleur
c35d8d1b8e Fix publish on foundation server 2016-03-13 12:48:08 +01:00
Laurent Destailleur
b16ef1b4f4 Prepare 3.9 release 2016-03-13 12:33:04 +01:00
Laurent Destailleur
930dd55e17 Prepare 3.9 release 2016-03-13 12:31:10 +01:00
aspangaro
5d88c10e94 Missing language file 2016-03-13 08:33:34 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
2016-03-13 01:31:12 +01:00
Laurent Destailleur
a5571b1040 NEW Show a badge with number of withdraw requests done on the withdraw
tab of invoice.
2016-03-13 01:20:54 +01:00
Laurent Destailleur
f345ff7300 Fix regression on vat calculation when invoice was not a situation
invoice
2016-03-13 01:11:42 +01:00
phf
0a533660b8 Fix travis phpcs 2016-03-12 21:17:09 +01:00
philippe grand
adc552d5ff Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-12 20:52:09 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation
invoice
2016-03-12 20:49:38 +01:00
philippe grand
df1c5697be [fix]: define to avoid issue with external pdf models 2016-03-12 19:07:56 +01:00
Laurent Destailleur
e0809fc750 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/compta/facture.php
	htdocs/product/document.php
2016-03-12 18:40:50 +01:00