Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 04:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

1856 Commits

Author SHA1 Message Date
Laurent Destailleur
217989d0e2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-02 15:37:40 +01:00
Laurent Destailleur
31aebf3457 Fix log 2021-02-02 13:44:54 +01:00
Laurent Destailleur
e2a65ad231 FIX #16131 2021-02-01 20:11:29 +01:00
Laurent Destailleur
2f5eb2aff7 FIX #16131 2021-02-01 20:09:50 +01:00
Laurent Destailleur
9ec5ba46fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-28 14:47:06 +01:00
Laurent Destailleur
f024f06df7 Fix url 2021-01-28 09:23:28 +01:00
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