Commit Graph

58124 Commits

Author SHA1 Message Date
Laurent Destailleur
9928f943a7 Remove hook that is duplicate code with trigger. 2017-02-28 11:40:04 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
821324868a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-27 12:15:31 +01:00
Laurent Destailleur
9a9887f482 Fix deletion of bank category/tag 2017-02-27 12:14:32 +01:00
Laurent Destailleur
d5dc88d66b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-27 12:08:18 +01:00
Laurent Destailleur
f579fc6b2d Code comment 2017-02-27 12:07:38 +01:00
Laurent Destailleur
1f693ca586 Code comment 2017-02-27 12:07:14 +01:00
Laurent Destailleur
1be389fd3e FIX deletion of bank tag 2017-02-27 12:06:45 +01:00
Laurent Destailleur
4572a78618 Fix bad table deleted 2017-02-27 12:03:20 +01:00
Laurent Destailleur
c210b2349d Fix bad table 2017-02-27 11:59:18 +01:00
Laurent Destailleur
0d07ad8c69 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/compta/bank/class/account.class.php
2017-02-27 11:58:35 +01:00
Laurent Destailleur
d9ba06e224 Fix bad table 2017-02-27 11:42:11 +01:00
Laurent Destailleur
10838983b5 FIX error management in bank account deletion. 2017-02-27 11:38:19 +01:00
Laurent Destailleur
024cecec29 FIX Error management during bank account creation 2017-02-27 11:16:46 +01:00
Laurent Destailleur
0f8a8869cb FIX Error management during bank account creation 2017-02-27 11:15:59 +01:00
Laurent Destailleur
cff284b2f3 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/compta/bank/categ.php
2017-02-27 10:55:18 +01:00
Laurent Destailleur
9ecc56ad4d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-02-27 10:48:36 +01:00
Laurent Destailleur
7951d1a0ed Fix CSS 2017-02-27 10:47:14 +01:00
Laurent Destailleur
3b85a41991 Fix PHPCS 2017-02-27 02:14:37 +01:00
Laurent Destailleur
d12caab69a The hook getNodeList has been replaced by a normalized 'addreplace' hook
getDirList.
2017-02-27 02:04:47 +01:00
Laurent Destailleur
74e8fb9c19 NEW Can set number of dump to keep with job "local database backup" 2017-02-27 02:04:25 +01:00
Laurent Destailleur
43f3e46aac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-27 01:23:48 +01:00
Laurent Destailleur
04044df36a Fix merge 2017-02-27 01:23:21 +01:00
Laurent Destailleur
4f24613de0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2017-02-27 01:19:03 +01:00
Laurent Destailleur
170ad1a265 Depreciate a class not really used 2017-02-27 00:56:44 +01:00
Laurent Destailleur
b7d715f03f Merge pull request #6469 from IonAgorria/mail_extrafields
NEW: Add object extrafields to mail form
2017-02-27 00:29:09 +01:00
Laurent Destailleur
eb1a94067a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-27 00:22:44 +01:00
Laurent Destailleur
92acbbd8a8 Fix parameters 2017-02-27 00:22:11 +01:00
Laurent Destailleur
3aaf9dae11 Fix parameter to cal cron method 2017-02-27 00:12:48 +01:00
Ion
320da17c78 Add object extrafields to mail form 2017-02-26 03:42:42 +01:00
Laurent Destailleur
e559834379 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-02-25 11:54:28 +01:00
Laurent Destailleur
08915d88d0 FIX the dolCopyDir fails if target dir does not exists. 2017-02-25 11:53:50 +01:00
Laurent Destailleur
bf591f5f91 Work on module website 2017-02-24 21:13:40 +01:00
Laurent Destailleur
63bee0c2d0 Doxygen 2017-02-24 16:23:43 +01:00
Laurent Destailleur
29578a38bd Keep previous behaviour if new option not set 2017-02-24 16:19:00 +01:00
Laurent Destailleur
7ee6dc7fa6 Merge pull request #6388 from atm-ph/new_deposit_with_multi_tva_management
New deposit with multi tva management
2017-02-24 16:16:33 +01:00
Laurent Destailleur
1f9b41b178 Merge pull request #6467 from laudeco/fix/expense_report_name
prepend the author firstname and lastname for ER ref
2017-02-24 15:51:47 +01:00
Laurent Destailleur
4e4ad4548a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-24 15:51:28 +01:00
Laurent Destailleur
5733826a68 Fix do not lose the user of expense report when we edit it. 2017-02-24 15:51:10 +01:00
Laurent Destailleur
7559437d8b Merge pull request #6464 from defrance/patch-85
add selectform choice for private mailing
2017-02-24 15:29:37 +01:00
Laurent Destailleur
77d5de6470 Merge pull request #6466 from laudeco/fix/edition_expense_report_without_tva
fix edition of expense report without vat
2017-02-24 15:29:13 +01:00
Laurent Destailleur
bc41b6dfe2 Merge pull request #6459 from defrance/patch-84
Add selectform for frst recur option (better usage)
2017-02-24 15:28:16 +01:00
Laurent Destailleur
d0ee8c0e2d Merge pull request #6458 from defrance/patch-83
inverted value between FRST & RECUR
2017-02-24 15:27:32 +01:00
Laurent Destailleur
69eb64a975 Merge pull request #6463 from laudeco/fix/expense_report_validation
use access right to validate expense report created for someone else
2017-02-24 15:25:02 +01:00
Laurent Destailleur
1ef899dacc Prepare database to follow supplier discounts 2017-02-24 15:22:32 +01:00
Laurent Destailleur
4804cc47bd Clean and uniformize code 2017-02-24 15:16:53 +01:00
Laurent Destailleur
47ea9b57e8 Fix Remove debug var_dump 2017-02-24 14:41:12 +01:00
Laurent Destailleur
559478048c Move resources for theme at a batter place 2017-02-24 14:38:20 +01:00
Laurent Destailleur
f75af2af37 Close #6146 - Let's experiment fontawesome. 2017-02-24 14:37:18 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00