Commit Graph

68848 Commits

Author SHA1 Message Date
Laurent Destailleur
e68612fa09 Fix initdemo must not copy index.html files 2018-02-24 12:06:26 +01:00
Laurent Destailleur
435e4823a5 Fix some warning during install 2018-02-24 11:58:09 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Laurent Destailleur
d8bf553ea9 Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing 2018-02-23 19:55:15 +01:00
Laurent Destailleur
7cf7bf6e45 Code comment 2018-02-23 16:26:23 +01:00
Laurent Destailleur
f3e1e81219 Fix update of extrafield password that are crypted 2018-02-23 16:11:25 +01:00
Laurent Destailleur
0a79550f43 Fix oldcopy must be saved before update_extras 2018-02-23 16:11:00 +01:00
Laurent Destailleur
787a137509 Add column for accounting doc 2018-02-23 15:38:39 +01:00
Laurent Destailleur
b42193b9ea Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-23 15:34:24 +01:00
Laurent Destailleur
812911bd44 Fix type of expense report output in PDF 2018-02-23 15:33:42 +01:00
Laurent Destailleur
f002c84a76 Fix type of expense report output in PDF 2018-02-23 15:33:00 +01:00
Laurent Destailleur
93a8176813 Fix do not encrypt if empty 2018-02-23 15:28:24 +01:00
Laurent Destailleur
953001c7ab Fix bad naming of column 2018-02-23 15:16:49 +01:00
atm-ph
d300b943e1 Fix wrong price on supplier order line 2018-02-23 15:10:25 +01:00
florian HENRY
b4b185abe0 fix bad link invoice URL into acoutantcy customer affectation 2018-02-23 14:42:52 +01:00
Laurent Destailleur
863cab362f NEW Cat set the encryption algorithm for extrafields of type password 2018-02-23 14:38:41 +01:00
Laurent Destailleur
cc618e886f Fix extrafield password must be >= than 64 for password_hash 2018-02-23 13:19:33 +01:00
Laurent Destailleur
8b479a05ad Can add property in password extrafield (prepare to choose encrypt algo) 2018-02-23 12:34:25 +01:00
John
3b54afc9b2 Fix type lines import 2018-02-23 12:12:36 +01:00
Marc de Lima Lucio
36cc1c6ca9 FIX: solve column mismatch in user card's usergroup list + code cleanup 2018-02-23 11:59:22 +01:00
Laurent Destailleur
f7ecac8734 Fix look and feel v7 2018-02-23 11:40:56 +01:00
Laurent Destailleur
b3d968d4a1 Fix look and feel v7 2018-02-23 11:40:20 +01:00
Laurent Destailleur
b6737d3607 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-02-23 11:24:45 +01:00
Laurent Destailleur
82ae65b18d NEW Can get template of email from its label 2018-02-23 11:23:36 +01:00
Laurent Destailleur
829de06bf6 Fix error management 2018-02-23 11:23:04 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +01:00
Laurent Destailleur
194f5a2cef Fix substitution key 2018-02-23 11:03:48 +01:00
Laurent Destailleur
d8f8e76bee Provide context to trigger 2018-02-23 10:39:39 +01:00
dolibarr95
6793d826b7
Dispatch if more than ordered
If the constant SUPPLIER_ORDER_MORE_THAN_WISHED is set
2018-02-23 10:14:54 +01:00
John
768c09bc74 Fix import order 2018-02-23 09:23:50 +01:00
John
b88e7fdcf9 move button to dialog footer 2018-02-22 17:21:12 +01:00
Laurent Destailleur
3f9a9f20ce Fix missing substitution key 2018-02-22 17:06:18 +01:00
Laurent Destailleur
420fe3a07a Clean code 2018-02-22 17:05:45 +01:00
Laurent Destailleur
76543023a1 Fix missing substitution key 2018-02-22 17:05:24 +01:00
John
c5b96e43c7 add new action to import order in invoice 2018-02-22 16:55:41 +01:00
Laurent Destailleur
a27ed54128 Fix sort order of email templates 2018-02-22 16:40:48 +01:00
John
a7a6630fad Add popin dialog 2018-02-22 15:19:20 +01:00
Rui Strecht
41c663f03f Fixed issue with elementarray null if num_rows = 0 2018-02-22 12:22:31 +00:00
Laurent Destailleur
b87feab1e3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
2018-02-22 12:19:20 +01:00
Laurent Destailleur
bc0993d6cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-22 12:17:25 +01:00
Laurent Destailleur
479c4b4d77 Fix look and feel v7 2018-02-22 12:15:11 +01:00
Laurent Destailleur
51cfb9795e Fix bad picto 2018-02-22 11:26:41 +01:00
Juanjo Menent
1d6baf5f2b Fix: Not showing link to ad event if module is disabled 2018-02-22 10:16:53 +01:00
Laurent Destailleur
9114a28e88 Fix: missing the reposition 2018-02-21 22:43:25 +01:00
Laurent Destailleur
0d0451e5c7 Code comment 2018-02-21 22:43:03 +01:00
Laurent Destailleur
f03fcef2d5 Fix: missing the reposition 2018-02-21 22:41:02 +01:00
Laurent Destailleur
0c59d536ba More accurante message 2018-02-21 22:01:46 +01:00
Marc de Lima Lucio
876ea3198f FIX: handle type in supplier invoice list 2018-02-21 17:51:44 +01:00
Marc de Lima Lucio
34d84c6d5d FIX: supplier credit notes: display link to discount in supplier credit note card 2018-02-21 17:15:16 +01:00
John
f313fb925b Add new checkbox for lines 2018-02-21 17:06:40 +01:00