lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

595 Commits

Author SHA1 Message Date
florian HENRY
310bdf6062 NEW : accounting export LD compta version 10 2020-03-12 11:55:26 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +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
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01: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
e81bcbde31 FIX export ledger 2020-02-05 16:08:00 +01:00
oscim
a0d3370b86
Update lettering.class.php 
add check colum date_validated IS NULL for block process lettering in fiscalyear is lasted validated
 2020-01-31 08:43:09 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
af61c19ffd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-29 23:06:21 +01:00
altairis
f1ea0ce5a1 better fix 2020-01-29 11:47:23 +01:00
altairis
b04bb9e392 FIX : fetching account on current entity 2020-01-29 11:05:10 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +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
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
9ceec670b9 Fix date format in FEC export 2020-01-13 13:52:48 +01:00
Alexandre SPANGARO
c3518426bd NEW Accountancy - Add possibility to manage an short alternative label - use to simplify 2020-01-03 22:05:49 +01:00
Laurent Destailleur
513b9b26a6
Merge branch 'develop' into 9.0_p4 2019-12-31 16:38:37 +01:00
Alexandre SPANGARO
77e3b01179 Fix Accountancy - Set NULL when data is empty 2019-12-31 08:00:20 +01:00
Laurent Destailleur
e3cc541ff2 Fix debug code 2019-12-16 19:19:37 +01:00
Laurent Destailleur
d22cd5c321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Frédéric FRANCE
b61a3f1ba9
Update bookkeeping.class.php 2019-11-18 19:59:21 +01:00
Frédéric FRANCE
5c0976a778
doxygen accountancy class 2019-11-16 09:58:14 +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
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
stickler-ci
11f29df93d Fixing style errors. 2019-11-10 09:52:03 +00:00
Philippe GRAND
762b70fab7 add some comment 2019-11-10 10:51:16 +01:00
Laurent Destailleur
feef992d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 11:16:09 +01:00
Laurent Destailleur
de77e39e08 FIX #12319 Restore feature ACCOUNTANCY_AUTOFILL_ACCOUNT_WITH_GENERIC. 
Now autofill works, option can be reverted in v11.
 2019-11-07 11:14:36 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Philippe Grand
3692a6602d
Update bookkeeping.class.php 2019-11-01 11:12:09 +01:00
stickler-ci
a8f7082a3a Fixing style errors. 2019-11-01 09:36:18 +00:00
Philippe GRAND
5bafcae767 add some comment 2019-11-01 10:36:17 +01:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Frédéric FRANCE
8761b46e21
Update bookkeeping.class.php 2019-10-16 22:31:34 +02: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
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83 NEW Accountancy - Add an option to hide FAQ on index and add widget in area 2019-09-23 20:42:50 +02:00
Laurent Destailleur
e3fe3d7d4f Fix missing var 2019-08-31 13:17:40 +02:00
Laurent Destailleur
defc0a6080 Fix missing property 2019-08-31 13:15:05 +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
Laurent Destailleur
dca775985f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:41 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
334e1a6737
Merge pull request #11583 from aspangaro/11.0_LDcompta 
NEW Accountancy Add export model LDCompta V9 & higher
 2019-07-30 15:59:43 +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
bb168d7f54 Merge branch '9.0' into 9.0_FEC 2019-07-29 06:54:48 +02:00
Alexandre SPANGARO
cd22cc70c8 FIX FEC Format - Save translation of the journal 2019-07-29 06:41:51 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00
Laurent Destailleur
6e3fad8f83 Fix phpcs 2019-07-25 17:42:44 +02:00
Alexandre SPANGARO
2162f2331d Try to fix travis 2019-07-24 06:57:42 +02:00
Alexandre SPANGARO
7bdfd83288 FIX FEC Format - Missing date_creation in general ledger when you add a new transaction 2019-07-22 15:15:08 +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
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
florian HENRY
21f6daae2a fix scrunitizer 2019-06-05 17:38:10 +02:00
Laurent Destailleur
b6f4cab20d
Merge pull request #11247 from aspangaro/develop 
Accountancy - Use Ansi on Agiris model export & indent
 2019-05-29 12:23:25 +02:00
Laurent Destailleur
fd0eb47b35 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-05-29 09:57:48 +02:00
Laurent Destailleur
35b021f203 Fix phpcs 2019-05-29 09:53:54 +02:00
Alexandre SPANGARO
4be46d35b0 Merge remote-tracking branch 'upstream/develop' into develop 2019-05-26 14:07:23 +02:00
Laurent Destailleur
19ff0120ff # WARNING: head commit changed in the meantime 
Removed uselesss files (replaced by DebugBar)
 2019-05-26 11:42:00 +02:00
Alexandre SPANGARO
09faf3aa5b Accountancy - Use Ansi on Agiris model export & indent 2019-05-24 21:48:36 +02:00
Laurent Destailleur
bad565cc64 Fix syntax error 2019-05-24 18:13:24 +02:00
Laurent Destailleur
0fc7ad7c1f Add one param to fetch of accounting account to solve chart import 2019-05-24 18:05:29 +02:00
Laurent Destailleur
769fbdb429 FIX the id was not loaded in fetch of accounting system 2019-05-24 17:39:37 +02:00
Alexandre SPANGARO
2085958a69 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-23 11:10:07 +02:00
Alexandre SPANGARO
4ba8cf0641 Fix 2019-05-23 11:08:06 +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
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Alexandre SPANGARO
d4e2fab983 Replace term "Advanced accountancy" by Accountancy (Double entries) 2019-05-13 22:25:15 +02:00
Laurent Destailleur
dd4e70efe7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2019-05-03 12:14:17 +02:00