Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
53,283 Commits 36 Branches 189 Tags
fb53b41078fbe9cb15cf4c3501729a3747a580b0
Commit Graph

4043 Commits

Author SHA1 Message Date
Laurent Destailleur
ff5f04dee1 Removed not required directories 2016-04-22 11:11:24 +02:00
Laurent Destailleur
d735f5dc70 FIX lost css change 2016-04-22 11:10:20 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Frédéric FRANCE
f90cffd74a Update nusoap.php 
re-establish user-agent
 2016-04-09 15:42:53 +02:00
Laurent Destailleur
66ec4cdcf6 Update pdfmake.js 2016-04-08 15:53:13 +02:00
Laurent Destailleur
443c5a490a Update ckeditor to 4.5.8 2016-04-08 15:36:24 +02:00
Laurent Destailleur
9d836571d5 Update PHPExcel 2016-04-08 15:32:13 +02:00
Laurent Destailleur
2f42a226d0 Update escpos-php 2016-04-08 15:30:43 +02:00
Laurent Destailleur
b29b5fa71d Merge pull request #4824 from FHenry/dev_jquery 
Last version of JQuery 1.12 and DataTables Componenent with working
 2016-03-25 16:50:26 +01:00
Laurent Destailleur
a68b704daf FIX Must not return error when vars does not exists 2016-03-25 15:57:36 +01:00
Laurent Destailleur
80e10158a5 Add code comment 2016-03-25 15:57:29 +01: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
a2b3b24ca9 FIX Must not return error when vars does not exists 2016-03-22 22:01:07 +01:00
Laurent Destailleur
dd26ede0ef Add code comment 2016-03-22 19:24:48 +01:00
Florian HENRY
371e593da3 better includes externel library 2016-03-18 10:56:55 +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
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
bad07bc38c Fix dos and bom and end of line 2016-03-12 18:30:19 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
64374bec00 Fix avoid wrapping in select2 combo list 2016-02-29 15:28:06 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
cf6c06f9e7 Reduce lost space into ckeditor margins 2016-01-28 04:47:31 +01:00
Laurent Destailleur
f3c83fba59 Merge pull request #4201 from GPCsolutions/dolibarr-composer 
Composer updates
 2016-01-10 11:56:47 +01:00
Laurent Destailleur
40963f2f2a FIX #4207 2015-12-27 18:46:21 +01:00
Laurent Destailleur
2f8fc05cdb Fix: QRcode must not be random 2015-12-20 21:28:05 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
Raphaël Doursenaud
b446aef192 FIX #3868 Upgraded ckeditor to 4.5.6 2015-12-17 22:44:47 +01:00
Regis Houssin
cb7f29b332 Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2015-12-16 13:32:44 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Raphaël Doursenaud
9257bfc5df Updated mobiledetect to 2.8.17 2015-12-07 13:53:59 +01:00
Raphaël Doursenaud
5dfa9ba369 Updated TCPDF to 6.2.12 2015-12-07 13:39:45 +01:00
Laurent Destailleur
f814bc11a0 Clean packaging 2015-11-26 01:27:59 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Jean-Pierre Morfin
0cb9cc2213 Correct pattern to match all odt var tags 
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
 2015-11-12 09:24:04 +01:00
Laurent Destailleur
cb29f91434 FIX An external libray must contains also non obfuscated code into 
source
 2015-11-11 19:11:43 +01:00
Laurent Destailleur
327d764284 Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr 
into GPCsolutions-dolibarr-php7

Conflicts:
	.gitignore
 2015-11-11 19:03:36 +01:00
Laurent Destailleur
ca62689a96 Merge pull request #3961 from frederic34/escpos 
Escpos : install lib with composer
 2015-11-11 18:30:57 +01:00
frederic34
954291ae0b re-add library escpos 2015-11-11 18:02:47 +01:00
frederic34
765e83d456 delete directory 2015-11-11 18:01:13 +01:00
Raphaël Doursenaud
c3ed30ffd8 Moved to new package for TCPDF 
Previous one has been deprecated by upstream
 2015-11-09 12:21:08 +01:00
Raphaël Doursenaud
e5915ce8d9 Upgraded PHPExcel to v1.8.1 
Fixes issues with PHP 7
 2015-11-09 12:19:48 +01:00