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

1900 Commits

Author SHA1 Message Date
Laurent Destailleur
53f09e31cc Update doc 2021-01-09 13:24:03 +01:00
Laurent Destailleur
d0b6466595 Prepare v13 packaging 2020-12-24 00:52:05 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
4aabf0f505 We keep only english file 2020-12-13 12:44:51 +01:00
Laurent Destailleur
85bb3fa909 Update chart.js to 2.9.4 2020-12-07 21:57:29 +01:00
UT from dolibit
3cc439d26f
Update README 
- Install InnoSetup
   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/

- Separation lines for better reading.
 2020-11-30 19:43:53 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
fab4fcf1d6 Fix to show error when file can't be open 2020-11-26 17:00:49 +01:00
UT from dolibit
a5af9996ba
Update copyright 2020-11-24 18:17:15 +01:00
Laurent Destailleur
cb3e204281 Fix use of dolibarr_main_distrib 2020-10-30 13:06:55 +01:00
Florian HENRY
5d38d01a27 add new container 2020-10-27 22:49:20 +01:00
Florian HENRY
e4dfed53c2 new maildev work in docker compose 2020-10-27 22:42:48 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Regis Houssin
dded02ebbf FIX update dolibarr.pl for Virtualmin 2020-10-13 12:06:28 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Florian HENRY
47e6ebcb8f expose mariaddb port on docker-compose 2020-10-10 08:31:07 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
79e94e3a2c Removed unexpected file 2020-10-06 21:59:38 +02:00
Laurent Destailleur
76fc8330a3 Fix for wampserver3_64 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2020-09-13 13:47:46 +02:00
Laurent Destailleur
ca4716dfb7 Fix for wampserver3_64 2020-09-13 13:45:28 +02:00
Laurent Destailleur
5e2494a82c Update doc 2020-09-13 13:17:21 +02:00
Laurent Destailleur
3aff66bc89 Doc 2020-09-13 13:08:28 +02:00
Laurent Destailleur
8a561c644f Doc 2020-09-13 13:03:33 +02:00
Florian HENRY
1dc84c5715 update docker to new standard 2020-09-07 16:04:06 +02:00
Florian HENRY
e9ff43ad44 ongoing 2020-09-01 14:31:54 +02:00
Florian HENRY
fba614632f working on docker image 2020-08-29 18:31:42 +02:00
Florian HENRY
b7f4162721 use new version docker file 2020-08-28 12:10:08 +02:00
Florian HENRY
08702a0d1a on going version 3 2020-08-26 14:16:49 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
dde83c8fcc Fix debian package 2020-08-08 10:17:52 +02:00
Laurent Destailleur
ac48576b88 Add missing dependency in debian package #12785 2020-08-07 14:49:07 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
e99ab329fd Remove bans 2020-06-25 22:22:54 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Laurent Destailleur
a8c91069b2 Fix doliwamp installer 2020-06-22 15:24:42 +02:00
Laurent Destailleur
984e3d112d Fix packager 2020-06-22 01:10:41 +02:00
Laurent Destailleur
119bf45177 Fix error in packaging 2020-06-22 00:41:21 +02:00
Laurent Destailleur
8ccaa0794e Update doc 2020-06-21 22:58:52 +02:00
Laurent Destailleur
0a22773eab Update doc 2020-06-21 22:58:08 +02:00
Laurent Destailleur
1ce3991d81 FIX #14036 2020-06-19 23:17:22 +02:00
Laurent Destailleur
5ac80844cb FIX #14036 2020-06-19 23:15:40 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
41664c1a0e
Merge pull request #13941 from bsene/fixes-13807-issue 
Fix #13807 Docker: PHP installation does not support GD graphical functions
 2020-05-23 13:48:15 +02:00
Laurent De Coninck
0bf6b26117
add a mail server 2020-05-23 12:20:56 +02:00
Birame SENE
e6a5d4c8d9 Add PNG/JPEG packages to build GD extension 2020-05-21 17:01:27 +02:00
Frédéric FRANCE
def53338de
add new rule 2020-05-21 09:07:10 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
 2020-05-07 12:03:49 +02:00
Laurent Destailleur
d9cef1c8d7 Fix packager to publish on new web site 2020-05-06 01:49:19 +02:00
Laurent Destailleur
80adf0fff1
Merge pull request #13700 from joseplluis/patch-7 
Update MySpanish.isl
 2020-04-22 18:05:55 +02:00
Josep Lluís
3f071462ab
Update MySpanish.isl 2020-04-22 17:50:15 +02:00
Josep Lluís
8207d27d00
Update MyCatalan.isl 2020-04-22 17:36:10 +02:00
Laurent Destailleur
d54c093ae2 Fix file 2020-04-22 00:57:28 +02:00
UT from dolibit
758246c2a9
Update MyGerman.isl 2020-04-21 20:33:41 +02:00
Laurent Destailleur
64aa231e33 Avoid password in files 2020-04-04 23:32:02 +02:00
Laurent Destailleur
2b725ad5d5 Update year in demo data 2020-03-30 14:57:56 +02:00
Laurent Destailleur
221776d07d Migrate DoliWamp to use WampServer 3 2020-03-29 23:06:48 +02:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
f7b4e48d59 Code comment 2020-03-20 10:51:26 +01:00
Laurent Destailleur
082da101e2
Merge pull request #13202 from dolibit-ut/patch-5 
Update README
 2020-02-26 05:15:01 +01:00
UT from dolibit
2543f3f21b
Update README 2020-02-25 13:37:39 +01:00
UT from dolibit
e60a6ee13d
add composer entry 
add entry of sub-directories:
* composer
To test an upgrade of a lib.
 2020-02-25 13:29:24 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
3823070d33 Fix package rpm 2020-01-29 20:11:18 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
db17a08144 Fix distrib in ping 2020-01-15 12:52:04 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
68169b6df0 Fix debian package 2020-01-13 14:43:27 +01:00
Laurent Destailleur
ab4e0fe99c FIX #12758 2020-01-13 14:38:01 +01:00
Laurent Destailleur
b7b87929d0
Merge branch 'develop' into hotfix/docker-ziparchive 2020-01-10 00:08:27 +01:00
Laurent De Coninck
dc364af635
make the docker supports ZipArchive 2020-01-09 09:53:39 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2019-12-14 14:43:14 +01:00
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/admin/system/filecheck.php
 2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
9f2a628c3b Remove bak file 2019-12-14 13:25:21 +01:00
Frédéric FRANCE
18e3a4bcbb
Update generate_filelist_xml.php 2019-12-13 12:56:02 +01:00
Frédéric FRANCE
030b78d79f
Update generate_filelist_xml.php 2019-12-13 11:16:04 +01:00
Frédéric FRANCE
cad54c6d7a
Update generate_filelist_xml.php 2019-12-13 10:42:49 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
069e39ead8
Update dolibarr-doxygen-build.pl 2019-12-11 21:09:47 +01:00
Frédéric FRANCE
4309601ffb
typo 2019-12-11 20:40:18 +01:00
Arunas Ruksnaitis
5572102ae5 Docker corrections 2019-12-10 00:30:47 +00:00
Daniel Seichter
c2eba28f36 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-14 00:18:03 +01:00
Laurent Destailleur
e79ac7081a Look and feel v11 2019-11-12 17:37:05 +01:00
Laurent Destailleur
c07f1f8246 Try exakat 2019-11-12 16:26:42 +01:00
Daniel Seichter
0e450b2acf remove duplicate entries 2019-11-12 16:17:23 +01:00
Laurent Destailleur
2ccef4e469 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2019-11-11 19:10:35 +01:00
Laurent Destailleur
96e93ef103 Clean code for tgz 2019-11-07 12:49:39 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Laurent Destailleur
263bd9cbc0 Filter 2019-10-18 15:12:07 +02:00
Laurent Destailleur
e8104a50ac Better params 2019-10-18 13:59:48 +02:00
Laurent Destailleur
aabf30ffd0 Tools to build dolibarr genesis video 2019-10-18 12:57:43 +02:00
Laurent Destailleur
9055d1a4c0 Add files and doc to execute gource on Dolibarr git project 2019-10-18 12:06:45 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
e7beadb58a Remove duplicate 2019-09-28 10:42:58 +02:00