Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,589 Commits 36 Branches 190 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

1549 Commits

Author SHA1 Message Date
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
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
Alexandre SPANGARO
a466104b81 Fix FEC on transaction card 
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
 2018-10-17 07:20:04 +02:00
Alexandre SPANGARO
a5ebcff2ee Fix lettering function 2018-10-16 22:27:34 +02:00
Alexandre SPANGARO
eb4ffcf1a7 Fix FEC Missing some information in bookkeeping 2018-10-16 21:17:00 +02:00
Frédéric FRANCE
a40271e475 Update bankjournal.php 2018-10-16 20:11:32 +02:00
Frédéric FRANCE
f470068d9d fix phpcs 2018-10-16 20:10:13 +02:00
Laurent Destailleur
ae76891853 Merge pull request #9751 from frederic34/patch-17 
Update bookkeeping.class.php
 2018-10-16 19:44:07 +02:00
Laurent Destailleur
63c79f23d6 Merge pull request #9749 from aspangaro/9.0_accountancy 
Fix FEC Missing some information on bookeeping
 2018-10-16 19:35:14 +02:00
Laurent Destailleur
f0c0c4779b Fix remove yellow alert 2018-10-16 19:32:35 +02:00
Laurent Destailleur
97429aeb7a Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Philippe GRAND
bd3315528e add links and highlight relevant text 2018-10-16 15:08:06 +02:00
Philippe GRAND
059c72c678 add links and highlight relevant text 2018-10-16 14:55:29 +02:00
Philippe GRAND
5f37e07540 add links and highlight relevant text 2018-10-16 14:42:36 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Alexandre SPANGARO
a971a2afe6 Fix FEC 2018-10-16 06:32:55 +02:00
Alexandre SPANGARO
3a6824da68 Fix FEC Missing label_compte & label_operation 2018-10-15 21:50:05 +02:00
Alexandre SPANGARO
47305f5b0b Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-15 20:06:02 +02:00
Laurent Destailleur
2684767b19 Fix pagination 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2018-10-15 11:08:40 +02:00
Laurent Destailleur
e29fb85cec Fix limit 2018-10-15 11:07:16 +02:00
Laurent Destailleur
aa6996e2d0 Fix pagination show two times the same account on balance of accounts 2018-10-15 11:07:07 +02:00
Laurent Destailleur
9afc53ca06 Fix remove step in accountancy if module expense report not used 2018-10-15 11:05:20 +02:00
Frédéric FRANCE
425e26ecb6 Update bookkeeping.class.php 2018-10-15 08:46:41 +02:00
Frédéric FRANCE
4d6d3afbea code comment 2018-10-15 08:39:46 +02:00
Alexandre SPANGARO
c8b9c11a01 Fix FEC Missing some subledger label on bookeeping 2018-10-15 06:53:48 +02:00