lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,702 Commits 43 Branches 150 Tags 886 MiB
57cfb4b007
Commit Graph

63506 Commits

Author SHA1 Message Date
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
a20d824b97 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:34 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Laurent Destailleur
a1a9313487
Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2 
Fix : only invoice active lines of a contract
 2019-06-02 12:29:13 +02:00
Laurent Destailleur
4bbef9b478
Update card.php 2019-06-02 12:29:05 +02:00
Laurent Destailleur
7020e1ef29
Update card.php 2019-06-02 12:27:32 +02:00
Laurent Destailleur
2b3c5902e6
Merge pull request #11281 from atm-maxime/fix_warning_resource 
Fix : warnings in resource module
 2019-06-02 12:17:19 +02:00
Laurent Destailleur
cb927847ab
Update dolresource.class.php 2019-06-02 12:16:12 +02:00
Laurent Destailleur
40b212d5cc
Merge pull request #11280 from atm-maxime/fix_warning_page_var 
Fix : avoid warning and uniformize $page var use
 2019-06-02 12:14:47 +02:00
Laurent Destailleur
3e9fbf0148
Update index.php 2019-06-02 12:14:07 +02:00
Maxime Kohlhaas
916d3ce931 Fix : only invoice active lines of a contract 2019-06-02 11:00:58 +02:00
Maxime Kohlhaas
0372276a7b Fix : warnings in resource module 2019-05-31 16:04:12 +02:00
Maxime Kohlhaas
6dd01e86e9 Fix : avoid warning and uniformize var use 2019-05-31 15:53:23 +02:00
Maxime Kohlhaas
9ab2f44946 Fix : missing rights test to display tag create link 2019-05-31 15:14:56 +02:00
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
12c1531b3b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-31 11:39:06 +02:00
Laurent Destailleur
cd75794aaa FIX #11169 #11202 2019-05-31 11:38:54 +02:00
Regis Houssin
bdd54ae245 FIX missing llx_const encrypt 2019-05-30 11:42:28 +02:00
Laurent Destailleur
69efc54fb6
Merge pull request #11263 from atm-arnaud/9.0_FIX_productaccount_buy_page 
FIX productaccount buylist with pages
 2019-05-29 13:52:53 +02:00
Laurent Destailleur
912e29a746 FIX #11244 2019-05-29 11:06:01 +02:00
Laurent Destailleur
3c05cfe690 Fix useless test 2019-05-29 10:50:33 +02:00
Laurent Destailleur
b46b675b7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-29 10:36:00 +02:00
Laurent Destailleur
a491de01b3
Merge pull request #11244 from altatof/8.0 
FIX : do not include tpl from disabled modules
 2019-05-29 10:35:39 +02:00
Laurent Destailleur
a26c8c0714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-29 09:55:55 +02:00
Laurent Destailleur
6e9cd819c1 Fix phpcs 2019-05-29 09:55:09 +02:00
Laurent Destailleur
35b021f203 Fix phpcs 2019-05-29 09:53:54 +02:00
atm-arnaud
a853764f6d FIX productaccount buylist with pages 2019-05-28 15:03:36 +02:00
Laurent Destailleur
2352463c21 Fix link to change validator is on validate status only 2019-05-28 13:23:12 +02:00
Laurent Destailleur
666e4fdb5f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 20:22:21 +02:00
Laurent Destailleur
991e247e30 Fix edit of validator 2019-05-27 20:21:50 +02:00
Laurent Destailleur
f5d51dab5f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-05-27 20:14:37 +02:00
Laurent Destailleur
02fc896612 FIX Even with permission, can't validate leave once validator defined. 2019-05-27 20:12:33 +02:00
Laurent Destailleur
1c6ddd25c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 19:23:54 +02:00
Laurent Destailleur
7db643fff0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-27 19:23:09 +02:00
Laurent Destailleur
93c395fe10 FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL 2019-05-27 19:22:51 +02:00
Laurent Destailleur
4596ec7d38 FIX Use of cron with multicompany 2019-05-27 18:11:15 +02:00
Laurent Destailleur
71da27f333 Add error message 2019-05-27 16:40:06 +02:00
atm-ph
c79b9b9704 Fix create bills on mass action does not retrieve the original currency code 2019-05-27 11:18:29 +02:00
Laurent Destailleur
08a731ab39 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-26 15:25:37 +02:00
Laurent Destailleur
45aaafd4d6 Fix email not set in paybox payment 2019-05-26 15:25:26 +02:00
Laurent Destailleur
a40e5ca66c Fix phpcs 2019-05-26 11:36:16 +02:00
Laurent Destailleur
c04d082ad1 FIX Import of chart of account 2019-05-24 18:14:15 +02:00
Laurent Destailleur
bad565cc64 Fix syntax error 2019-05-24 18:13:24 +02:00
Laurent Destailleur
0fc7ad7c1f Add one param to fetch of accounting account to solve chart import 2019-05-24 18:05:29 +02:00
Laurent Destailleur
769fbdb429 FIX the id was not loaded in fetch of accounting system 2019-05-24 17:39:37 +02:00
Laurent Destailleur
49991eabf8 Fix import of accounting account from ref in import profiles 2019-05-24 17:09:18 +02:00
Laurent Destailleur
63824861a6 Fix import of chart of account. The account parent was not managed. 2019-05-24 16:58:06 +02:00
Christophe Battarel
83d883c36a finally eldy is always right 2019-05-24 15:14:34 +02:00
Christophe Battarel
4863ddcb00 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-24 15:13:23 +02:00