Commit Graph

118 Commits

Author SHA1 Message Date
Laurent Destailleur
097be322a6 Modify code to match new v6 structure. 2017-06-15 19:29:00 +02:00
Laurent Destailleur
20fb12bc7d Merge pull request #6959 from aspangaro/6.0-fec2
NEW : Accountancy - Activate multi-journal everywhere & Add journal_label information to database (FEC)
2017-06-08 10:56:53 +02:00
Alexandre SPANGARO
5e3a2e06d4 NEW : Accountancy - Activate multi-journal & Add journal_label to database (FEC) 2017-06-08 06:35:09 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Alexandre SPANGARO
806d25ae41 Activate multi-journal on expensereport journal 2017-06-05 06:44:53 +02:00
Regis Houssin
a25facef7c Fix: use 0 instead false 2017-06-03 11:49:59 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
04c05efafe FIX Several bugs in accounting module. 2017-04-29 15:16:36 +02:00
Laurent Destailleur
faddcb28ac FIX serious bugs in accounting (error management, transactions, bad
values set)
2017-04-29 14:53:29 +02:00
philippe grand
4d31759ff9 Update code using new css class 2017-04-11 14:35:10 +02:00
Laurent Destailleur
3e2c0d26f2 Fix MVC 2017-02-20 11:59:58 +01:00
Charlie Root
c0b4667713 NEW: Use the expense repport author account instead of the default account, if exists 2017-01-27 10:50:50 +01:00
Jean-Pierre Morfin
b13cf15b8c Use current chart of accounts to get accountancy labels in journals view and export 2016-12-10 12:59:10 +01:00
aspangaro
029fa1ed8a Finishing works 2016-10-27 06:04:23 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
aspangaro
6314df035a Work on expense report accountancy integration 2016-10-24 07:16:26 +02:00