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

73275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ATM-Nicolas
a9d7bbc2ed FIX : Remove unexisting link 2020-03-06 09:52:19 +01:00
Laurent Destailleur
52a92924de
Merge pull request #13230 from atm-gauthier/fix_round_accountancy 
FIX : round MT in accountancy books
 2020-02-29 12:35:33 +01:00
gauthier
284a4189b3 FIX : round MT in accountancy books 2020-02-28 14:32:35 +01:00
Laurent Destailleur
530930b7aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-23 23:30:38 +01:00
Laurent Destailleur
ac2f6bdc42
Merge pull request #13178 from gmilad/patch-2 
Update note.php
 2020-02-23 22:45:00 +01:00
Laurent Destailleur
5648205beb
Merge pull request #13181 from atm-maxime/8.0 
Fix #10179 discount split
 2020-02-23 22:43:21 +01:00
Maxime Kohlhaas
0ab16ed5ae Fix #10179 discount split 2020-02-23 16:50:24 +01:00
gmilad
559fc9f61e
Update note.php 
Fix : #13168
 2020-02-22 13:07:25 +01:00
Laurent Destailleur
d6917b6b08
Merge pull request #13152 from fmarcet/9.0 
FIX: Visualization rights correction on last modified contacts box
 2020-02-21 18:14:09 +01:00
Ferran Marcet
9ff424e23b FIX: Visualization rights correction on last modified contacts box 2020-02-20 11:45:46 +01:00
Laurent Destailleur
88f0cc1331
Merge pull request #13113 from aspangaro/9.0_FEC 
FIX: Force FEC export to txt format
 2020-02-14 18:56:31 +01:00
Alexandre SPANGARO
72e59e6fe2 FIX: Force FEC export to txt format 2020-02-14 16:07:06 +01:00
Laurent Destailleur
102428a503 Merge pull request #13056 from atm-lena/FIX_cabyprodlist_filter 
FIX CA by prod list filter
 2020-02-08 16:09:18 +01:00
Laurent Destailleur
4b6276ff92 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
atm-lena
ecea726323 FIX CA by prod list filter 2020-02-07 15:01:37 +01:00
Laurent Destailleur
387db16217 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:03:10 +01:00
Laurent Destailleur
b6efd098dd Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-05 19:37:03 +01:00
Laurent Destailleur
bf4fca0c7e Fix warning 2020-02-03 22:09:21 +01:00
Laurent Destailleur
42769e2e7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
3a9ef7c5e7
Merge pull request #12911 from aspangaro/9.0_FEC 
FIX: FEC export format
 2020-01-23 12:04:55 +01:00
Laurent Destailleur
cbe396b97c
Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082
Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
b513ad90eb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:33 +01:00
Laurent Destailleur
e0a12edf31 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:10 +01:00
Laurent Destailleur
0625a7194f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-01-10 19:47:32 +01:00
Laurent Destailleur
ec6e933f66 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-01-10 19:47:00 +01:00
Laurent Destailleur
e0c8ccb9fb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-01-10 19:45:35 +01:00
Laurent Destailleur
ef00cb0736 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-01-10 19:44:52 +01:00
Laurent Destailleur
d7f7f5bf3d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2020-01-10 19:42:34 +01:00
Laurent Destailleur
7c0a6946a7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2020-01-10 19:42:15 +01:00
Laurent Destailleur
1ecc1afa9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2020-01-10 19:41:49 +01:00
Laurent Destailleur
ceb1e699b7 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2020-01-10 19:37:16 +01:00
Laurent Destailleur
c028819cab FIX clone of purchase order 2020-01-10 19:35:49 +01:00
Laurent Destailleur
4f2f2f0d73
Merge pull request #12815 from artis-auxilium/fix_massaction_checkbox 
Fix massaction checkbox when product module disable
 2020-01-10 00:22:02 +01:00
Dev2a
57c954f2e8 Fix Check array of action after kooks 2020-01-07 21:41:36 +01:00
Dev2a
2d67c2365f Fix Check right for service for arrayofmassaction 
if product module disable, threre is no action for service
 2020-01-07 18:59:58 +01:00
Laurent Destailleur
36e6036e9e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-23 14:01:00 +01:00
Laurent Destailleur
76d23141fd
Merge pull request #12727 from fappels/patch-1 
Update 6.0.0-7.0.0.sql
 2019-12-23 14:00:15 +01:00
Laurent Destailleur
cc8a291f28
Merge pull request #12730 from atm-maxime/fix_shipment_close 
Fix prevent double action on shipment close
 2019-12-17 19:35:25 +01:00
Maxime Kohlhaas
3e19702e39 Fix prevent double action on shipment close 2019-12-17 18:05:59 +01:00
Francis Appels
95b56f0518
Update 6.0.0-7.0.0.sql 
timestamp NOT NULL can cause SQL error.
 2019-12-17 12:19:35 +01:00
Laurent Destailleur
cdb730cf4a
Merge pull request #12724 from atm-florian/9.0 
fix: task document tab FATAL without thirdparty
 2019-12-17 12:14:55 +01:00
Laurent Destailleur
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
florian HENRY
bb6523b75d fix task document banner without thirdparty FATAL 2019-12-17 10:49:56 +01:00
Laurent Destailleur
31a60ff30b Fix $db 2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-14 14:34:14 +01:00