lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,708 Commits 43 Branches 150 Tags 886 MiB
5eef373ed6
Commit Graph

52708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5eef373ed6 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/user/card.php
 2016-03-18 14:56:44 +01:00
Laurent Destailleur
2f5c190060 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-18 14:53:27 +01:00
Laurent Destailleur
227e27bf4a Merge pull request #4845 from simnandez/3.9 
FIX: Can not select a commercial on the creation of a third
 2016-03-18 14:17:08 +01:00
Laurent Destailleur
d9683abdf9 Merge pull request #4844 from defrance/patch-110 
FIX : hookmanager must be init in new ajax selectsearchbox
 2016-03-18 14:16:41 +01:00
Laurent Destailleur
fb625f0ca7 FIX #4812 2016-03-18 13:58:06 +01:00
Juanjo Menent
875f4023de FIX: Can not select a commercial on the creation of a third 2016-03-18 13:16:33 +01:00
Laurent Destailleur
97b630ac65 NEW Can use ^ and $ (to say start with or end with like regex syntax) 
into search fields when search field is text. Bonus: ^$ can filter all
lines with field not defined.
 2016-03-18 12:42:13 +01:00
Laurent Destailleur
c5e744bfc2 FIX #4839 2016-03-18 12:16:40 +01:00
BENKE Charlie
830f78b1c6 FIX : hookmanager must be init 
Else we can't use is on additionnal modules
 2016-03-18 11:55:41 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
5edeeae384 FIX Bad error and style message when changing its own login 2016-03-18 11:30:15 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
 2016-03-18 11:06:41 +01:00
Laurent Destailleur
44dc07a61b Merge pull request #4807 from bafbes/abb-13 
added handle to trigger FICHINTER_ADD_CONTACT in notify module
 2016-03-18 02:40:27 +01:00
Laurent Destailleur
a664aa9a06 Merge pull request #4811 from fappels/develop_patch_subprice 
Update commande.class, subprice should be unit price without tax
 2016-03-18 02:30:55 +01:00
Laurent Destailleur
c20124e369 Merge pull request #4829 from jtisseau/starttls 
NEW Sending email can also use the STARTTLS protocol.
 2016-03-18 00:48:13 +01:00
Laurent Destailleur
28638786b9 Merge pull request #4806 from bafbes/abb-12 
constant FICHINTER_WITHOUT_DURATION to handle interventions without duration in lines
 2016-03-18 00:39:43 +01:00
Laurent Destailleur
7692c39879 Merge pull request #4614 from bafbes/abb-3 
include expense reports in linked objects section and provide template for them in this section
 2016-03-18 00:26:24 +01:00
Laurent Destailleur
b023aa317f Merge pull request #4840 from atm-alexis/3.8_FIX_finished_param_not_use 
FIX finished parameters not used
 2016-03-18 00:11:07 +01:00
Laurent Destailleur
dc78cc7ced Merge pull request #4837 from hregis/3.9_order 
Fix: missing model selected
 2016-03-18 00:10:30 +01:00
Laurent Destailleur
7e8e05d938 Merge pull request #4821 from FHenry/develop 
NEW Update accoutancy with last dev
 2016-03-18 00:08:00 +01:00
Laurent Destailleur
e201357907 Merge pull request #4817 from aspangaro/3.9-p19 
Fix: 3.9 Problem of rowspan in edit mode on user card
 2016-03-18 00:02:19 +01:00
Laurent Destailleur
18804ee929 FIX Bad color of message password changed 2016-03-18 00:01:14 +01:00
Laurent Destailleur
75ed221fb8 Fix regression with last PR: change of password was not working. 2016-03-17 23:58:04 +01:00
Laurent Destailleur
404ac60226 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-17 23:45:29 +01:00
Laurent Destailleur
bbcc7d83ea Merge pull request #4834 from hregis/3.9_bug 
Fix: beware with merges in conflict !!
 2016-03-17 23:44:49 +01:00
Laurent Destailleur
e5f0027dbf Merge pull request #4823 from ndrosis/3.9 
FIX SQL syntax error in export
 2016-03-17 23:37:23 +01:00
Laurent Destailleur
22f6e0e92d Merge pull request #4831 from fmarcet/3.9 
FIX: Not showing sellprice properly on product list
 2016-03-17 23:33:05 +01:00
Laurent Destailleur
a102dc29d4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-17 23:19:28 +01:00
Laurent Destailleur
fb16feb666 FIX Same term to create than other objects 2016-03-17 23:19:19 +01:00
Laurent Destailleur
76896e92a6 Merge pull request #4822 from atm-alexis/FIX_bad_function_name 
FIX # Bad function name setEventMessagess call on project delete
 2016-03-17 23:14:24 +01:00
Laurent Destailleur
c61110935d Merge pull request #4803 from aspangaro/3.9-p17 
FIX Missing language file loading
 2016-03-17 23:13:47 +01:00
Laurent Destailleur
2c4f01859c Merge pull request #4802 from grandoc/3.9 
[fix]: define  to avoid issue with external pdf models
 2016-03-17 23:13:13 +01:00
Laurent Destailleur
cd687f57d6 NEW Can change type of extrafields for some combinations. 2016-03-17 21:58:51 +01:00
Alexis Algoud
19e3c1b089 FIX finished parameters not used 2016-03-17 16:35:23 +01:00
Regis Houssin
2642b710ea Fix: missing model selected 2016-03-17 15:56:03 +01:00
Regis Houssin
a2bb57e33b Fix: use clone instead dol_clone 2016-03-17 15:22:05 +01:00
Regis Houssin
ae16d6c45c Fix: missing color update 2016-03-17 15:11:57 +01:00
Laurent Destailleur
aa7eb4935c FIX VAT rate can be negative. Example spain selling to morroco. 2016-03-17 12:18:47 +01:00
Laurent Destailleur
1683609d9a FIX Check of EAN13 barcode when mask was set to use 13 digits instead of 
12
 2016-03-17 12:00:38 +01:00
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