Commit Graph

234 Commits

Author SHA1 Message Date
Laurent Destailleur
1c9e7145e7 Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00
Marc de Lima Lucio
24ffce0be5 FIX: supplier credit notes: accounting display in purchases journal 2018-03-01 11:21:15 +01:00
Laurent Destailleur
284e6f1ad3 Better position of error check 2018-02-12 13:39:06 +01:00
Laurent Destailleur
caa136bed3 FIX Debug journalization: Avoid journalizing if all lines not bound 2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f Fix journalization protection 2018-02-12 12:02:01 +01:00
Laurent Destailleur
c2590b9c7e Fix: complete labels of operation if bank journal
Conflicts:
	htdocs/compta/tva/class/tva.class.php
2018-02-05 17:10:18 +01:00
Laurent Destailleur
a91172b7bc Add comment into csv export 2018-02-03 18:58:02 +01:00
Laurent Destailleur
fe1f276d85 FIX labels into ledger are same that into screen
FIX pagination
FIX init of fiscal year
Fix tr balance
2018-02-02 17:24:40 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible.
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Laurent Destailleur
7a1a2cf90d Fix send into ledger for bank line record. Show accounted status. 2018-01-22 04:13:29 +01:00
Laurent Destailleur
273e88a599 Fix send into ledger for expense report. Show accounted status. 2018-01-22 03:07:11 +01:00
Laurent Destailleur
e152e81d18 Fix close code 2018-01-11 18:24:40 +01:00
Laurent Destailleur
9b448459c9 Fix dispatching replacement invoice into bookkeeping (not used by most
countries in europe)
2018-01-09 19:12:08 +01:00
Laurent Destailleur
ebc76b5f27 Fix tooltips on thirdparty and invoice 2018-01-04 18:29:12 +01:00
Laurent Destailleur
59ed23069c Fix debug accounting module 2018-01-04 15:52:07 +01:00
Alexandre SPANGARO
7b935a96bf FIX : Various payment 2017-12-11 07:03:37 +01:00
Alexandre SPANGARO
1269d98df2 Merge remote-tracking branch 'uptream/develop' into 7.0-7
# Conflicts:
#	htdocs/accountancy/admin/export.php
#	htdocs/accountancy/class/accountancyexport.class.php
#	htdocs/accountancy/journal/expensereportsjournal.php
2017-12-09 06:14:34 +01:00
Alexandre SPANGARO
065ef4e5c2 Fix : Accountancy some cleaning 2017-12-09 06:00:13 +01:00
Laurent Destailleur
9b5f7099f7 Code comment 2017-12-03 19:50:15 +01:00
Laurent Destailleur
a15a57317b Debug accountancy module 2017-11-28 11:12:13 +01:00
Laurent Destailleur
b63fb1f854 Support of VAT NPR in accounting module 2017-11-27 22:18:10 +01:00
Laurent Destailleur
a9d3e90b70 Big debug of accountancy module 2017-11-27 21:53:22 +01:00
Laurent Destailleur
533a82187a NEW Add a protection so we can't journalize non balanced transactions 2017-11-27 17:12:48 +01:00
Laurent Destailleur
aaf08ade2f Fix bug reported by scrutinizer 2017-11-25 11:21:31 +01:00
Laurent Destailleur
06de67cb8a Update purchasesjournal.php 2017-11-24 16:37:19 +01:00
John
d8f18e18ce Add new doActions hook 2017-11-23 12:08:33 +01:00
Frédéric FRANCE
6d33cc3980 align export bankjournal on others 2017-11-20 15:02:11 +01:00
Scrutinizer Auto-Fixer
f59d87f06d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-06 00:42:32 +00:00
Alexandre SPANGARO
2f49b00f6c Fix : some small problems on accountancy 2017-10-05 06:56:13 +02:00
Alexandre SPANGARO
0acb391b36 Fix : label_operation on general ledger 2017-10-03 05:27:08 +02:00
Laurent Destailleur
c5bf5c7e67 Minor fixes 2017-09-12 15:26:44 +02:00
Laurent Destailleur
dc61c53d39 Balance automatically set on good year according to fiscal start month 2017-09-12 15:22:23 +02:00
Laurent Destailleur
85cad6d537 Add TODO 2017-09-12 15:10:51 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
c498ce3c41 FIX journalization for bank journal should not rely on a label. 2017-09-08 17:50:39 +02:00
Laurent Destailleur
8b20c5edab FIX Remove warning when using log into syslog 2017-09-08 15:46:06 +02:00
Laurent Destailleur
f29a4c1fb1 Make accountancy pages responsive 2017-09-05 20:42:34 +02:00
Laurent Destailleur
a0cdf784da Standardize code 2017-09-05 09:43:22 +02:00
Laurent Destailleur
4c8945e460 Fix bad use 2017-09-04 12:59:54 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Regis Houssin
ad39c30c21 Fix: change old email 2017-08-23 21:23:18 +02:00
Laurent Destailleur
5b9ac2a7a9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
6902960d07 Fix sign of amount debit/credit/montant 2017-07-25 21:03:30 +02:00
Laurent Destailleur
c5267154b9 Merge branch 'develop' into Bookkeeping-V6 2017-07-25 20:54:37 +02:00
Laurent Destailleur
bab963ec07 FIX Pagination on the ledger page. 2017-07-15 19:19:12 +02:00
Laurent Destailleur
d671421b8b Fix journalization of vat payments 2017-07-15 18:29:18 +02:00
Laurent Destailleur
fa00373e56 Fix remove log 2017-07-15 17:52:30 +02:00
Laurent Destailleur
a20bf05c64 Debug journalization 2017-07-15 17:32:22 +02:00
Laurent Destailleur
c6dcccba18 Fix better warning when record will be saved into a waiting account. 2017-07-15 14:55:04 +02:00