Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
101,561 Commits 36 Branches 189 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

1881 Commits

Author SHA1 Message Date
Frédéric FRANCE
0d3afb573a align check code 2021-05-10 14:33:26 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
Laurent Destailleur
b0df3733fa Merge pull request #17465 from dolibit-ut/patch-316 
Create REAME
 2021-05-03 13:55:17 +02:00
Laurent Destailleur
a27b783002 Rename REAME to README 2021-05-03 13:55:08 +02:00
Laurent Destailleur
1cb8df1d20 Merge pull request #17464 from dolibit-ut/patch-315 
Update README
 2021-05-03 13:11:00 +02:00
UT from dolibit
d74359a4e4 Create REAME 2021-05-02 19:28:58 +02:00
UT from dolibit
8bc23088b1 Update README 
http://www.trustonme.net/didactels/273.html  is empty
fedoraproject.org  has been moved
 2021-05-02 19:22:52 +02:00
UT from dolibit
b7954b12e2 Update README.howto 
alioth.debian.org is outdated --> https://alioth-archive.debian.org/  -->  https://salsa.debian.org/public
 2021-05-02 18:55:23 +02:00
Laurent Destailleur
c693668d38 Clean code 2021-04-30 14:26:39 +02:00
Laurent Destailleur
a40083ae1c Fix packaging 2021-04-29 10:03:16 +02:00
Laurent Destailleur
ea08dfff5a Package for v14 2021-04-27 02:21:02 +02:00
Laurent Destailleur
436101b9b7 Merge pull request #17090 from dolibit-ut/patch-217 
Update htmldoc_en.book
 2021-04-02 22:31:00 +02:00
UT from dolibit
05bc027f7c Update htmldoc_en.book 2021-04-02 21:42:02 +02:00
UT from dolibit
62129c722a Update README 2021-04-02 21:39:25 +02:00
Laurent Destailleur
85b76cc4df Fix title 2021-03-20 01:22:09 +01:00
Laurent Destailleur
e40ba085e1 Add package php-intl into debian package 2021-03-16 15:05:12 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
88a3454ba8 FIX #16366 2021-03-02 00:48:02 +01:00
Frédéric FRANCE
6f9c639f08 add new rule 2021-03-01 00:48:36 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
910fa6c041 Fix missing dir for fedora rpm 2021-02-20 11:16:26 +01:00
Laurent Destailleur
9a2e99e9e9 Clean packager 2021-02-20 11:09:23 +01:00
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