lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,304 Commits 43 Branches 150 Tags 886 MiB
3.8
Commit Graph

3970 Commits

Author SHA1 Message Date
Laurent Destailleur
ebb061e68d Merge pull request #1997 from defrance69/patch-26 
Update odf.php
 2014-11-04 17:37:47 +01:00
Laurent Destailleur
0b41df7c35 Clean code to manage multiselect jquery: All code is centralized 
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
 2014-11-04 00:33:50 +01:00
BENKE Charles
5586893ca2 Update odf.php 
add new fonction getvalue (valuename)
return value inside [valuename][/valuename] tag
 2014-11-01 21:00:28 +01:00
Laurent Destailleur
97c9d6bafc Fix dos files 2014-09-07 12:28:58 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
789427b75d Upgrade phpexcel lib to 1.7.8 2014-09-07 12:12:30 +02:00
Laurent Destailleur
5a93a7620c Upgrade tcpdf to 6.0.093 to get fixes and solve a problem of licence. 2014-09-07 11:00:54 +02:00
Laurent Destailleur
f64cb085a7 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-08-30 18:27:34 +02:00
Laurent Destailleur
c21b389462 Fix: Pb with focus position with ckeditor 2014-08-21 14:17:27 +02:00
Laurent Destailleur
f58da0fa73 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/main.lang
 2014-08-01 02:05:38 +02:00
Regis Houssin
977300c653 Fix: missing skin.js 2014-07-31 11:15:30 +02:00
frederic34
6645b8a454 Cannot redeclare getmypid() 2014-07-31 10:21:47 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
bf96a78f63 Try a fix when timezone string is not standard 2014-07-04 13:07:53 +02:00
Laurent Destailleur
072aca0bd6 License violation: Missing source on min file. 2014-05-27 00:26:53 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
ac27884b88 Fix: [ bug #1366 ] Special characters are HTML encoded with WYSIWYG 
module.
 2014-05-07 19:13:02 +02:00
Raphaël Doursenaud
6cd5d2724a Updated ADOdb Date Time Library to v0.32 
Includes important fixes for PHP 5
 2014-05-03 19:51:32 +02:00
Laurent Destailleur
6eac7e1bdc Fix: CRLF 2014-03-15 23:17:46 +01:00
Laurent Destailleur
7e11551199 Fix: CRLF 2014-03-15 21:45:33 +01:00
Laurent Destailleur
c65d681d87 New: Update ckeditor to version 4 (part 1) 2014-03-08 12:11:01 +01:00
Raphaël Doursenaud
9a1919238f TCPDF: Replaced missing courier monotype font by provided freemono 
The courier font is missing from TCPDF's directory.
This leads to "TCPDF ERROR: Could not include font definition file: courier" being outputed by PHP
when the library attempts to render an element with a monotyped font.
Use freemono instead since it's a better alternative (e.g. supports more glyphs) and is already
shipped with Dolibarr.
 2014-03-04 08:19:59 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
cam.lafit
1229842dc6 Provide a new constant about odt2pdf mangement : Don't remove odt source 
* MAIN_ODT_AS_PDF_DEL_SOURCE by default disable
* If set then initial behaviour is conserved, odt file is removed
 2014-01-06 20:07:15 +01:00
Laurent Destailleur
2e0fc364bd Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb Fix: Removed analytics tags 2013-12-30 12:35:32 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Florian Henry
306a51f6bd remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 13:54:53 +01:00
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +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
Laurent Destailleur
649124e8ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2013-10-29 23:50:25 +01:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php
 2013-09-13 09:32:41 +02:00
Laurent Destailleur
54976951a1 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7 Fix: Missing sources 
Fix: packager
 2013-09-12 23:47:36 +02:00
Cédric Salvador
2ec8720629 crlf to lf 2013-09-12 14:24:51 +02:00
Laurent Destailleur
6c47ee22b4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
 2013-09-11 23:12:47 +02:00
Laurent Destailleur
899c209468 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-11 23:10:54 +02:00
Laurent Destailleur
6f2652f2b6 Fix: Use correct standard 2013-09-11 23:07:47 +02:00
Laurent Destailleur
301187a117 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
 2013-09-11 21:54:57 +02:00
Laurent Destailleur
d6c35c1ee7 Fix: Opensource rules violation (sources must be included with lib) 2013-09-11 21:39:33 +02:00
Raphaël Doursenaud
07b321b6c3 Replaced PHP 5.5 deprecated call in external library 2013-09-11 15:00:35 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
306f6dd839 Updrage to tcpdf 6.0.021 2013-07-19 00:14:30 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
e7982120df Fix bug with php 5.2.4 2013-07-05 21:17:35 +02:00
Laurent Destailleur
33ed654745 New: Upgrade jquery flot library to 0.8.1 2013-07-03 03:40:59 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Regis Houssin
930f6e4850 Fix: avoid error with crlf 2013-06-24 18:04:06 +02:00
Regis Houssin
307ae65924 Fix: crlf to lf for avoid errors with git clone 2013-06-24 17:43:27 +02:00
Regis Houssin
ae67496730 Fix: crlf to lf 2013-06-24 17:41:15 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Laurent Destailleur
6779724dc0 Merge pull request #1055 from FHenry/3.4 
Fix ODT to PDF exec scripts path
 2013-06-19 09:30:11 -07:00
Laurent Destailleur
e92e6f7131 Fix: Icon of wrong version 2013-06-19 17:00:11 +02:00
Laurent Destailleur
9bd41e94b5 Fix: Pb in css 2013-06-19 17:00:01 +02:00
Laurent Destailleur
8dd34c194e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-19 16:51:32 +02:00
Laurent Destailleur
5ee3d67488 Fix: Icon of wrong version 2013-06-19 16:44:04 +02:00
Laurent Destailleur
51d40b94cc Fix: Pb in css 2013-06-19 15:52:06 +02:00
Florian Henry
dc5db0c137 fix ODT to PDF script path 2013-06-18 09:07:53 +02:00
Laurent Destailleur
f0c8c1805f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-17 22:11:24 +02:00
Laurent Destailleur
9becf83d70 Keep zapfdingbats. 2013-06-17 22:10:44 +02:00
Laurent Destailleur
2042fc3a21 Qual: Update jquery.tablednd plugin. Use minified version (all embedded 
plugins should use minified version).
 2013-06-17 13:16:25 +02:00
Florian Henry
7cc7e8392d Fix ODT to PDF exec scripts path 2013-06-17 11:58:59 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Laurent Destailleur
e13974b5f3 Fix: tcpdf bug 2013-06-08 15:29:27 +02:00
Alessandro Ponzio
3666999c37 Fixed bug in jsgantt.js showing 'NaN' when start/end date were missing 2013-05-10 07:10:05 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Laurent Destailleur
8f214a77c5 Fix: Fix error with linux rules 2013-04-30 21:31:35 +02:00
Grand Philippe
0661f9f1f8 fix: Assigning the return value of new by reference is deprecated 2013-04-28 10:40:25 +02:00
Laurent Destailleur
ac4c236dbc Merge pull request #874 from grandoc/develop 
Develop
 2013-04-24 09:02:51 -07:00
Grand Philippe
026195689b fix undefined offset 2013-04-24 15:22:37 +02:00
Grand Philippe
d2a718d0e6 fix undefined offset 2013-04-24 15:18:42 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
fhenry
e6f9c567d9 Fix odt as PDF generation 2013-04-22 12:08:35 +02:00
fhenry
ffb97010c9 Better file name management 2013-04-20 11:03:23 +02:00
fhenry
96126d9c99 Save PDF file 2013-04-20 10:54:11 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if 
libreoffice/jodconverter/exec shell right)
 2013-04-20 10:44:01 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files. 
Qual: Removed not used library.
Look: Uniformize css.
 2013-04-15 18:00:20 +02:00
fhenry
629ef78dc8 Add subtitution inside header and fotter document 2013-04-11 18:38:50 +02:00
fhenry
af40d27eb5 Remove require_once from odf.php because it cause regression. 2013-04-11 17:26:49 +02:00
Stephen L
6e1e41e8b5 update: Sync odtphp lib (fix a lot of bugs and add a few functionalities) 
Ref: b4e02a1306

Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2013-04-07 17:27:35 +02:00
Regis Houssin
86b521287c Fix: upgrade all files 2013-03-24 22:05:46 +01:00
Regis Houssin
eaf914cada Fix: upgrade jQuery datatables with 1.9.4 for avoid problems 2013-03-24 21:33:35 +01:00
Laurent Destailleur
5cc6bd1343 Qual: removed not used library 2013-03-15 18:29:44 +01:00
frederic34
717ba46a5f Print IPP lib 2013-03-08 11:17:46 +01:00
Raphaël Doursenaud
a6407a3642 Removed UTF-8 BOM from included libraries 2013-03-01 14:17:36 +01:00
Laurent Destailleur
7238c5156e New: Update jquery mobile lib 2013-02-24 19:33:06 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
6db881c09d New: Add link collapse all - expand all. 
Fix: Add missing images.
 2013-02-20 18:34:54 +01:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
Laurent Destailleur
a268592b61 Qual: Clean not used library. 2013-01-28 18:01:50 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
6ff9444903 Fix: temporary folder when creating ODT segments on Windows or system… 2012-12-29 01:25:56 +01:00
Laurent Destailleur
8e764e88e6 Update TCPF 
Added japanese font files.
 2012-12-10 01:47:39 +01:00
Laurent Destailleur
3fa7afae10 Fix: jquery upgrade has broken background compatibility with plugins. 
Upgrade jquery core only if required.
 2012-11-18 11:52:04 +01:00
Laurent Destailleur
8c27a3202b Qual: Removed useless files. Speed gain was not significant, has problem 
with https and need a lot of work to maintain each time we update an
external lib.
 2012-11-17 11:56:30 +01:00