2
0
forked from Wavyzz/dolibarr
Commit Graph

1676 Commits

Author SHA1 Message Date
Laurent Destailleur
b15403207b Merge pull request #10077 from aspangaro/9.0p1
Fix create accounting account from balance
2018-11-29 11:16:27 +01:00
Laurent Destailleur
b9e544d291 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/resource/list.php
2018-11-26 23:08:06 +01:00
Laurent Destailleur
84d73086ea Fix bookkeeping list was empty 2018-11-26 22:53:56 +01:00
Laurent Destailleur
4bb8568d6c Fix doxygen 2018-11-25 12:18:45 +01:00
Alexandre SPANGARO
703d3d90eb Revert "Fix create accounting account from balance"
This reverts commit 9154fd366f.
2018-11-24 22:40:04 +01:00
Alexandre SPANGARO
9154fd366f Fix create accounting account from balance 2018-11-24 22:30:06 +01:00
Frédéric FRANCE
d21abc2dc3 Update accountancycategory.class.php 2018-11-22 23:26:04 +01:00
Frédéric FRANCE
295d082da1 Update accountancycategory.class.php 2018-11-22 22:56:38 +01:00
Frédéric FRANCE
21b429836a doc comment accountancycategory class 2018-11-22 21:08:03 +01:00
Laurent Destailleur
fe35e72e83 Fix perf. Make only one request per group for year N-1. 2018-11-22 20:45:50 +01:00
Laurent Destailleur
5727cf2910 Prepare code for performance enhancement 2018-11-22 20:09:27 +01:00
Laurent Destailleur
72fc0226e3 Optimize performance: Remove call for year N, can be done with total of
each month
2018-11-22 19:45:35 +01:00
Laurent Destailleur
89138bc349 FIX Accounting personalized report when using multicompany 2018-11-22 10:59:39 +01:00
Laurent Destailleur
21e9c02b11 Performance enhancement in Accounting Personalized report 2018-11-22 10:40:15 +01:00
atm-quentin
4cc3fa1006 FIX we dont share object for accountancy 2018-11-16 11:23:27 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
Frédéric FRANCE
ce6b7adaa0 Merge remote-tracking branch 'upstream/develop' into actionrefused 2018-11-15 22:15:45 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Frédéric FRANCE
4909e3afc4 doc bookkeeping class 2018-11-14 08:28:20 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
ed3a333436 Fix phpcs 2018-11-10 13:11:18 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
7dd941dd51 Fix bad fix 2018-11-06 19:51:16 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Alexandre SPANGARO
af1305a0a8 Fix Specific finename for FEC export only available on general ledger export 2018-11-01 07:24:48 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5 Merge pull request #9866 from frederic34/emptylines
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Frédéric FRANCE
21c441540c add string cast 2018-10-25 21:57:19 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
612e3a9805 Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
into aspangaro-9.0_accountancy

# Conflicts:
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
#	htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
Laurent Destailleur
769bae75e9 Update list.php 2018-10-24 02:48:38 +02:00
Laurent Destailleur
a9736c1eef Merge pull request #9828 from frederic34/patch-15
code comment
2018-10-24 02:44:46 +02:00
Laurent Destailleur
065d715d41 FIX #9837 - The fetchAllXXX was not managing correctly the limit 2018-10-24 02:20:07 +02:00
Laurent Destailleur
fe665a060d Merge branch 'develop' into patch-17 2018-10-24 01:42:02 +02:00
Alexandre SPANGARO
930dce7611 change class name from lettering to Lettering 2018-10-22 06:39:23 +02:00
Alexandre SPANGARO
3f79580b19 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-22 06:33:34 +02:00
Laurent Destailleur
2816bdf747 FIX Date into filename of FEC file. 2018-10-21 16:22:56 +02:00
Frédéric FRANCE
02954931d8 Update thirdparty_lettrage_supplier.php 2018-10-20 16:27:15 +02:00
Frédéric FRANCE
d3022413ef Update thirdparty_lettrage.php 2018-10-20 16:25:57 +02:00
Frédéric FRANCE
fab10acc15 change class name from lettering to Lettering 2018-10-20 16:23:43 +02:00
Frédéric FRANCE
550dc622ca code comment 2018-10-20 13:40:40 +02:00
Alexandre SPANGARO
a7de7013a1 Update code 2018-10-20 11:20:53 +02:00
Alexandre SPANGARO
921757c4a3 Fix travis 2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465 Debug Lettering 2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-20 06:35:39 +02:00
Laurent Destailleur
4571210bcf Fix remove deprecated field 2018-10-19 15:45:56 +02:00
Laurent Destailleur
5a228bf394 Merge pull request #9786 from aspangaro/9.0_accountancy2
Fix FEC on accountancy movement card
2018-10-19 14:33:46 +02:00