lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86,383 Commits 43 Branches 150 Tags 886 MiB
9afe335e4e
Commit Graph

86383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
9afe335e4e
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-14 18:45:52 +02:00
Laurent Destailleur
40fa0933eb Fix on sarch pages 2020-05-14 18:44:21 +02:00
Laurent Destailleur
d8ee049b4c Can select not defined language 2020-05-14 18:41:31 +02:00
Laurent Destailleur
40d30f9a60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 18:37:47 +02:00
Laurent Destailleur
7daef0d146 Fix bad parameters of function 2020-05-14 18:17:08 +02:00
Laurent Destailleur
f7d69e443e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 18:15:08 +02:00
Laurent Destailleur
1bf677f537 Can set status of a websitepage 2020-05-14 18:14:55 +02:00
Laurent Destailleur
949e0f2326 Fix filter on language 2020-05-14 17:27:12 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
499c2ea30a FIX #13855 2020-05-14 16:52:21 +02:00
Laurent Destailleur
215cf9e6f8 Prepare v13 2020-05-14 16:45:32 +02:00
Laurent Destailleur
b68722a66c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 16:40:51 +02:00
Laurent Destailleur
9becb24073 Prepare v13 2020-05-14 16:40:40 +02:00
Laurent Destailleur
aed917bda9
Merge pull request #13862 from aspangaro/12.0_a27 
NEW Accountancy balance - Add a input to show subtotal by group
 2020-05-14 16:40:02 +02:00
Laurent Destailleur
adcc9e14f6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 16:35:39 +02:00
Laurent Destailleur
c1fb712c86 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:53 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
92b245ae93 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
 2020-05-14 16:34:24 +02:00
Laurent Destailleur
2b8da85eea Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-14 16:20:15 +02:00
Laurent Destailleur
49cfc1afd8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/install/upgrade2.php
 2020-05-14 16:20:04 +02:00
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master 
TakePOS Auto Order improvements
 2020-05-14 16:18:28 +02:00
Laurent Destailleur
bc581ead3b
Merge branch 'develop' into master 2020-05-14 16:17:37 +02:00
Laurent Destailleur
f5b9151f17
Merge pull request #13871 from FHenry/11.0 
fix template email on propal list
 2020-05-14 16:10:33 +02:00
Laurent Destailleur
136d002639
Merge pull request #13872 from simnandez/11.0 
FIX: Do not show stats panel if the user does not have permissions
 2020-05-14 16:09:37 +02:00
Laurent Destailleur
1032e5dfda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 16:07:35 +02:00
Laurent Destailleur
b26c1757e6 Prepare v13 2020-05-14 16:07:23 +02:00
Laurent Destailleur
14fce7fe55 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:03:42 +02:00
Laurent Destailleur
3d26351c6b Fix function if hours. 2020-05-14 16:03:31 +02:00
Laurent Destailleur
2c1e1f43dc
Merge pull request #13879 from frederic34/patch-4 
Update dolistore.class.php
 2020-05-14 16:00:36 +02:00
Laurent Destailleur
aae1b9f7fe
Merge pull request #13873 from ptibogxiv/patch-337 
Fix mailing entity
 2020-05-14 16:00:04 +02:00
Laurent Destailleur
b8265d3604
Merge pull request #13878 from atm-gauthier/10.0_fix_wrong_param 
FIX : wrong url param
 2020-05-14 15:59:37 +02:00
Laurent Destailleur
30c167c6f4
Merge pull request #13885 from atm-maxime/fix_top_menu_search 
Fix top menu search method must be GET
 2020-05-14 15:58:32 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7 
FIX 9.0 - fatal during migration from 3.1 using PHP 7
 2020-05-14 15:49:08 +02:00
Laurent Destailleur
01525e1d3b
Merge pull request #13884 from indelog/impraccountfile 
Fix and imporve some points for compta/accounting-flles.php
 2020-05-14 15:48:30 +02:00
Laurent Destailleur
928ed6eecc
Merge pull request #13889 from atm-john/11.0_fix_multicompany_shared_filter 
Fix multicompany supplier product price filter
 2020-05-14 15:44:45 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
68512e0281 Look and feel v12 2020-05-14 14:56:15 +02:00
Laurent Destailleur
9a8e9bdc99 Position of fields 2020-05-14 14:30:43 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:30:36 +02:00
Laurent Destailleur
a796122f7b Fix to solve feedbacks of 
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
 2020-05-14 14:30:32 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +02:00
Laurent Destailleur
4a04cecbaa CSS 2020-05-14 14:30:22 +02:00
Laurent Destailleur
72c6aa81bb Trans 2020-05-14 14:30:15 +02:00
Laurent Destailleur
4a65b629ee Position of fields 2020-05-14 14:29:14 +02:00
Laurent Destailleur
bcaa83eeec FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:10:04 +02:00
Laurent Destailleur
1bd00b0e8c Fix to solve feedbacks of 
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
 2020-05-14 12:28:17 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
DEMAREST Maxime (Indelog)
ac0b735131 Fix use date_ech for social contributions in accounting-file.php 2020-05-13 18:01:00 +02:00
Frédéric FRANCE
be78ef5fb3
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-13 17:53:41 +02:00