Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 02:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,834 Commits 36 Branches 191 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

73 Commits

Author SHA1 Message Date
Laurent Destailleur
c5267154b9 Merge branch 'develop' into Bookkeeping-V6 2017-07-25 20:54:37 +02:00
florian HENRY
b9d5f4ba10 fix : Various misspelling class (eclipse Oxygen standard PHP control) 2017-07-24 09:02:32 +02:00
Laurent Destailleur
bab963ec07 FIX Pagination on the ledger page. 2017-07-15 19:19:12 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Darkjeff
30153f8c2e add in bookkeeping date lim reglement 
Date lim reglement for export Sage and Iris
correct avoir when write in bookkeeping
 2017-07-03 07:21:15 +02:00
florian HENRY
6e8c83b2a9 fix class error (given by eclipse Oxygen version) 2017-06-29 15:47:33 +02:00
Laurent Destailleur
d186aed96c Fix: date must be stored into a date field (error with pgsql). 
import_key is reserved for "import" process.
 2017-06-27 18:26:17 +02:00
Alexandre SPANGARO
95573e8608 Fix : Accountancy - Debug 2017-06-19 21:39:43 +02:00
Laurent Destailleur
8f6e756249 Fix PHPCS 2017-06-19 15:37:22 +02:00
Alexandre SPANGARO
e9b6afd2aa Add last session coding - Add temporaly ledger 2017-06-18 22:17:32 +02:00
Alexandre SPANGARO
b240f536b5 Fix : Accountancy - Debug and add information in database 2017-06-17 07:54:35 +02:00
Laurent Destailleur
343e8d8498 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-16 00:49:52 +02:00
Laurent Destailleur
ac708a8ee9 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-15 23:58:56 +02:00
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
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
cce05a4070 Merge branch 'develop' into 6.0-d2 2017-05-29 11:45:13 +02:00
Alexandre SPANGARO
095545e8d9 Fix : Correct bank transfert when we write operation on general ledger 2017-05-28 21:56:18 +02:00
Alexandre SPANGARO
db6d7d9e21 Spaces 2017-05-25 07:15:36 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
04b1535b12 FIX Found duplicate line when it is not. 2017-04-29 14:59:40 +02:00
Laurent Destailleur
faddcb28ac FIX serious bugs in accounting (error management, transactions, bad 
values set)
 2017-04-29 14:53:29 +02:00
Laurent Destailleur
5353aa6efe Better error management when creating bookkeepin entries 2016-12-10 02:38:07 +01:00
Laurent Destailleur
839f30bea9 Fix scrutinizer warnings 2016-11-22 19:45:28 +01:00
Laurent Destailleur
0af0aa89bb Debug 2016-11-17 19:49:33 +01:00
Laurent Destailleur
206970b82c Fix management of multientity 2016-11-15 11:42:01 +01:00
Laurent Destailleur
cef43bf4b6 Better support of multicompany 2016-10-21 11:10:11 +02:00
Laurent Destailleur
a7c6ecc177 Fix better compatibility with multicompany 2016-10-14 16:05:25 +02:00
Laurent Destailleur
e74718827f Debug accountancy module 2016-10-14 15:44:33 +02:00
Laurent Destailleur
f7f56132b2 Fix sql errors 2016-10-06 20:15:36 +02:00
Laurent Destailleur
9ad96c2be3 Debug module accountancy expert 2016-10-05 20:50:47 +02:00
Laurent Destailleur
31ce725d73 Maxi debug of accountancy expert module 2016-10-04 19:31:05 +02:00
Laurent Destailleur
fee47f7583 Fix for multicompany management 2016-09-29 12:36:59 +02:00
Laurent Destailleur
64ab02234b Fix not return in a constructor 2016-08-31 20:03:54 +02:00
Neil Orley
0cab1a16d9 NEW|Display bookkeeping by accounting account 
- Bookkeeping ordered by accounting account
- Link with customers and suppliers invoices
- Sub Total by accounting account
- Ability to display more than 25 lines and filter by customer/supplier, invoice and accounting account
 2016-07-01 11:21:55 +02:00
florian HENRY
dfc4f3e7fe on going accountacy working 2016-06-29 11:06:02 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page 
& review
 2016-04-17 15:44:04 +02:00
aspangaro
e79c6c1439 Correct travis error 2016-04-03 17:09:22 +02:00
aspangaro
f8bc456807 FIX: Accountancy - Update balance to add description of the accounting account + bugfix 2016-04-03 15:32:46 +02:00
Florian HENRY
c380faacce Accountancy 2016-03-15 08:58:53 +01:00
Florian HENRY
e40de3ce28 fix accoutancy 2016-03-10 11:39:26 +01:00
Florian HENRY
4401995540 Accountancy feature 2016-02-09 19:22:52 +01:00
Florian HENRY
48b191b1ff Fix tuff into accountancy 2016-02-01 15:08:01 +01:00
Florian HENRY
65162ae8e9 Accountancy modules 2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +01:00
bobby
6aa6c067fb fix travis 2016-01-28 13:24:38 +01:00
bobby
c286c4c6ec Accoutancy update 2016-01-25 12:39:21 +01:00