2
0
forked from Wavyzz/dolibarr
Commit Graph

201 Commits

Author SHA1 Message Date
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
5c2b9e3078 NEW Introduce PhpSpreadsheet for export (need php5.6+) 2019-01-21 14:06:01 +01:00
Laurent Destailleur
cde9da57f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-16 13:39:56 +01:00
Laurent Destailleur
e14b426985 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/exports/export.php
2018-12-16 13:39:16 +01:00
Laurent Destailleur
cca3b4870a FIX CVE-2018-19799 2018-12-16 13:36:51 +01:00
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
853566cc28 Fix bold chars in tooltips 2018-12-10 14:40:42 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-quentin
83e4d6bd13 NEW export reception 2018-10-11 15:28:28 +02:00
Philippe GRAND
ddbf5e59e1 clean and update code 2018-06-18 10:12:19 +02:00
Frédéric FRANCE
f5605bdd7d loadlangs 2018-05-26 20:51:17 +02:00
Laurent Destailleur
488c0c030e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modProduct.class.php
2018-05-23 18:09:25 +02:00
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
Laurent Destailleur
eb8664e649 NEW Can export leave requests 2018-02-09 16:08:28 +01:00
atm-quentin
ce29331c05 NEW Filter export model by user 2018-01-18 12:34:22 +01:00
Laurent Destailleur
bc1f741600 Fix duplicate instructions 2018-01-03 14:46:18 +01:00
Laurent Destailleur
8659d97e97 Fix export of lot must use properties of lot from product_lot 2017-11-24 17:44:19 +01:00
Laurent Destailleur
6165bcdbd0 NEW Can export list of stock movements 2017-10-20 14:52:01 +02:00
Laurent Destailleur
46586f3055 Can export Websites pages.
Work on export to be able to use the generic declaration of fields.
2017-07-28 14:54:13 +02:00
Laurent Destailleur
c088ccea32 Fix better management of export of extrafield computed. 2017-06-13 18:50:31 +02:00
Laurent Destailleur
1748f1d451 Better tooltip for computed field 2017-05-09 17:00:07 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
35b79818b7 Uniformize css rules 2017-03-16 20:33:51 +01:00
Laurent Destailleur
afa5ef2913 NEW Introduce fields that can be computed during export in export
profiles.
2017-02-17 00:19:28 +01:00
Laurent Destailleur
4c3255857c Fix bad syntax into criteria to filter on date in export.
Fix missing type in export of invoices.
2017-02-08 10:45:20 +01:00
Laurent Destailleur
5e4509953d Associated product must be on another export profile 2017-01-29 21:25:29 +01:00
Laurent Destailleur
ec5c4ebf6b FIX timeout during export (can be solved only if safe_mode is off) 2017-01-17 11:20:56 +01:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
c96a3bfc13 Fix when going back on an export page after session has expired to avoid
a technical error.
2016-07-15 14:14:55 +02:00
Laurent Destailleur
453c6264bf FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly 2016-06-24 02:19:41 +02:00
Laurent Destailleur
9e24abacac Missing translation load 2016-04-30 13:26:31 +02:00
Laurent Destailleur
a656e42d42 Missing translation 2016-04-05 10:16:07 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Laurent Destailleur
843dada35d Fix translation export/import 2016-02-22 17:42:41 +01:00
philippe grand
fc8c12d6f6 [Qual] Uniformize code 2015-12-10 16:14:37 +01:00