lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

199 Commits

Author SHA1 Message Date
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Frédéric FRANCE
337689d5d2
code syntax 2021-02-22 21:36:42 +01:00
Laurent Destailleur
be3703a05b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-15 16:46:55 +01:00
Laurent Destailleur
f0e234c874 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/bank/various_payment/list.php
 2021-02-15 16:45:17 +01:00
Alexandre SPANGARO
83f9451b43 FIX: Accountancy - Fix some problems on CEGID export 2021-02-11 13:17:20 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Alexandre SPANGARO
939f27deed Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero 2021-01-21 20:55:46 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Alexandre SPANGARO
dae1794e3d FIX: Accountancy - Export Gestinum_v3 use facnumber for customer invoice 2021-01-13 11:08:33 +01:00
Alexandre SPANGARO
20fba8f4d2 FIX : Accountancy - FEC Export - Add trans & unaccent on journal label 2021-01-12 05:46:24 +01:00
Alexandre SPANGARO
5001cfce71 NEW: Accountancy - Format FEC - Add new field DateLimitReglmt 2020-12-28 04:12:23 +01:00
Laurent Destailleur
1d6e2a01a6
Merge pull request #15762 from aspangaro/13b1 
FIX: Accountancy - Quadra export format - Manage negative amount
 2020-12-16 15:24:14 +01:00
Alexandre SPANGARO
ca40d5e52a NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software 2020-12-16 05:16:08 +01:00
Alexandre SPANGARO
a03de433be FIX: Accountancy - Quadra export format - Manage negative amount 2020-12-16 05:03:37 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
4f79fdb4ab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:25 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +01:00
Laurent Destailleur
be249538ee Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
 2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
 2020-12-08 18:11:39 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
53cf513173
Merge pull request #15180 from aspangaro/14a1 
NEW: Accountancy - Add export for Gestinum (v3 & v5)
 2020-11-24 09:10:59 +01:00
Laurent Destailleur
47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/fourn/product/list.php
	htdocs/product/fournisseurs.php
	htdocs/societe/card.php
 2020-11-10 11:10:35 +01:00
Laurent Destailleur
73df033000 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/boxes/box_birthdays.php
 2020-11-10 11:05:53 +01:00
Laurent Destailleur
4a5c7d299f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-11-09 19:47:25 +01:00
Alexandre SPANGARO
617c930574 FIX: Accountancy - Some ajustments on length of the account (general & auxiliary) 2020-11-09 14:13:09 +01:00
Alexandre SPANGARO
6b91f739be Merge remote-tracking branch 'upstream/develop' into 14a1 2020-11-08 03:58:22 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
53009e41fe
Update accountancyexport.class.php 2020-10-27 18:10:38 +01:00
Alexandre SPANGARO
7c1eb128e9 Merge branch '14a1' of https://github.com/aspangaro/dolibarr into 14a1 2020-10-27 16:29:36 +01:00
Alexandre SPANGARO
7a7f51cd00 Fix stickler 2020-10-27 16:29:10 +01:00
stickler-ci
967eb5fa8e Fixing style errors. 2020-10-27 15:20:34 +00:00
Alexandre SPANGARO
0931a42dc2 Move format Charlemagne 2020-10-27 16:17:52 +01:00
Alexandre SPANGARO
1b8f9e6a67 Useless to specify css format export, csv is format by default 2020-10-27 16:14:52 +01:00
Alexandre SPANGARO
d46feda3e5 NEW: Accountancy - Add export for Gestinum (v3 & v5) 2020-10-27 16:13:07 +01:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Alexandre SPANGARO
8fc9b78b47 FIX Problems on FEC format 2020-09-11 06:55:03 +02:00
Laurent Destailleur
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
gauthier
e50d239322 FIX : force rounding 2 on export ld compta 2020-06-16 11:40:01 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +02:00
stickler-ci
7ad80c9bf6 Fixing style errors. 2020-05-08 11:53:11 +00:00
Alexandre SPANGARO
640158ea4c NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta 2020-05-08 13:50:26 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
stickler-ci
74655b759c Fixing style errors. 2020-03-16 16:34:28 +00:00
florian HENRY
105c2e9978 fix ldcompta10 2020-03-16 17:31:16 +01:00
florian HENRY
8e473ee365 Merge branch 'dev_ldcompta10' of github.com:FHenry/dolibarr into dev_ldcompta10 2020-03-12 12:28:30 +01:00
florian HENRY
c5a4adf63f update doc 2020-03-12 12:25:19 +01:00
stickler-ci
85c8296e10 Fixing style errors. 2020-03-12 10:59:08 +00:00
florian HENRY
310bdf6062 NEW : accounting export LD compta version 10 2020-03-12 11:55:26 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
ccb895e251
Merge pull request #13083 from atm-greg/FIX_bookkeeping_LD_Compta_Export 
fix missing fields in LD Compta Export
 2020-02-12 18:41:34 +01:00
Laurent Destailleur
03a8414ba8 FIX #13085 2020-02-12 18:21:45 +01:00
stickler-ci
fc170c1081 Fixing style errors. 2020-02-11 15:20:46 +00:00
atm-greg
66f6d1bfd4 add missing fields 2020-02-11 15:57:49 +01:00
Laurent Destailleur
2e0929c2e9 FIX export ledger 2020-02-05 16:08:28 +01:00
Laurent Destailleur
7ad827f212 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
9ceec670b9 Fix date format in FEC export 2020-01-13 13:52:48 +01:00
Laurent Destailleur
0e3d90f145 Fix syntax error 2019-11-14 12:42:44 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
75a47eebe0 Fix Method fetchAll must NEVER be used for table with more than 1000 
record
 2019-10-16 16:17:51 +02:00
Alexandre SPANGARO
04dc9e957f Update new LDCompta Export 2019-10-09 16:33:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
22575bb6e7 Fix travis 2019-08-04 13:08:38 +02:00
Laurent Destailleur
a03771ce61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:40 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
atm-quentin
2e3d700ef5 NEW export livre Charlemagne 2019-08-01 15:19:11 +02:00
Laurent Destailleur
dfc2bebbb6 FIX #11400 2019-08-01 13:27:07 +02:00
Alexandre SPANGARO
96380f01c6 Test in progress 2019-07-29 15:41:53 +02:00
Alexandre SPANGARO
56f124844c Test in progress 2019-07-29 10:04:28 +02:00
Alexandre SPANGARO
df73345046 NEW Accountancy Add export model LDCompta V9 & higher 2019-07-19 17:07:55 +02:00
Laurent Destailleur
57140b79dc Restore official text of licence 2019-06-24 18:30:07 +02:00
Philippe GRAND
4d3107c57b all http addresses should be https now 2019-06-23 15:43:32 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10 
Fix link to direct debit payment order
 2019-06-20 13:37:06 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Alexandre SPANGARO
09faf3aa5b Accountancy - Use Ansi on Agiris model export & indent 2019-05-24 21:48:36 +02:00
Alexandre SPANGARO
2085958a69 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-23 11:10:07 +02:00
a-schild
fff133b8a5 PSR_2 Format of code 2019-05-22 11:40:58 +02:00
a-schild
a823882f76 Some more formatting fixes 2019-05-22 10:57:59 +02:00
a-schild
5f25398c5c Corrected code format and documentation 2019-05-22 10:34:39 +02:00
a-schild
d54c1aca01 Add accountancy export option for Sage50 Swiss 2019-05-22 10:01:25 +02:00
Alexandre SPANGARO
5a05cc184b Fix Accountancy Export OpenConcerto 2019-05-19 10:48:43 +02:00
Laurent Destailleur
bd1ed4f7ac
Merge branch 'develop' into 10.0_Differentiated_export 2019-05-16 21:26:20 +02:00
Alexandre SPANGARO
f123f9951f NEW Add OpenConcerto export format 2019-05-15 12:16:03 +02:00
Alexandre SPANGARO
d4e2fab983 Replace term "Advanced accountancy" by Accountancy (Double entries) 2019-05-13 22:25:15 +02:00
Frédéric FRANCE
f9c1289a5b
Update EBP export 
@aspangaro @Darkjeff can you confirm that montant must be always >0 (in case of credit)
 2019-03-25 14:52:30 +01:00
Laurent Destailleur
63b6900f2c Fix phpcs 2019-03-15 16:09:20 +01:00
Laurent Destailleur
39e6e71b0d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2019-03-14 14:20:34 +01:00
Laurent Destailleur
3073567763 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 14:17:52 +01:00
Alexandre SPANGARO
d926657534 FIX: Accountancy - Format EBP import 
Add doc
 2019-03-08 10:57:14 +01:00