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

2416 Commits

Author SHA1 Message Date
Laurent Destailleur
3f119c8004 Fix eol 2021-04-08 01:43:38 +02:00
Laurent Destailleur
2816677d94 Fix css 2021-04-07 01:09:23 +02:00
Laurent Destailleur
baf3cbdd6f
Merge pull request #17096 from Hystepik/develo#2 
Close #17073 : Add of select line for mass deletion of chart of account lines
 2021-04-06 19:46:46 +02:00
Laurent Destailleur
ab2231c9cf
Update account.php 2021-04-06 19:44:31 +02:00
Laurent Destailleur
adbe832826
Update bookkeeping.class.php 2021-04-06 19:02:17 +02:00
Alexandre SPANGARO
241b0d3f63 Merge remote-tracking branch 'upstream/develop' into 14a32 2021-04-06 10:13:13 +02:00
lmarcouiller
3f70904398 changes to match eldy advices 2021-04-06 09:42:05 +02:00
Laurent Destailleur
95de241245 FIx #yogosha5774 2021-04-05 15:21:17 +02:00
Laurent Destailleur
01eec2b919 FIx #yogosha5774 2021-04-05 15:11:28 +02:00
Laurent Destailleur
5769701cd0 Better example 2021-04-05 15:05:21 +02:00
Alexandre SPANGARO
a50ca93a3e FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries 2021-04-04 16:34:17 +02:00
Alexandre SPANGARO
9e8ed661b3 FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries 2021-04-04 08:06:59 +02:00
Alexandre SPANGARO
025304ad6d Accountancy - Add a constant to enable fk_docdet register 2021-04-04 07:12:01 +02:00
lmarcouiller
369994fa92 Fix #17073 : Add of select line and mass delete 2021-04-03 10:12:05 +02:00
Laurent Destailleur
bb8ec90b79 Fix css 2021-04-02 02:50:07 +02:00
Laurent Destailleur
55741506c8
Merge pull request #17053 from aspangaro/14a30 
NEW: Accountancy - Add FEC import
 2021-03-31 22:15:26 +02:00
stickler-ci
416a09672f Fixing style errors. 2021-03-31 18:43:09 +00:00
Alexandre SPANGARO
dd913b2385 Update 2021-03-31 20:40:26 +02:00
Laurent Destailleur
2af8b7078c Fix turnover calculation was wrong. We must include only 2021-03-31 19:50:43 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
27bc05a039 Debug report accountancy 2021-03-31 17:59:42 +02:00
Alexandre SPANGARO
9b65529fc7 NEW: Accountancy - Add FEC import 2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
5723dbb836 FIX: Add a sub table to manage accountancy on product/company 2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
Alexandre SPANGARO
4e30481fa2 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-30 22:05:03 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Alexandre SPANGARO
ea6b22f06e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 03:27:46 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
 2021-03-29 21:47:31 +02:00
Laurent Destailleur
2689bc938d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Alexandre SPANGARO
3c70a3d06c Move to _PERENTITY 2021-03-27 07:25:31 +01:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
Alexandre SPANGARO
1382323f77 FIX Start hour on ACCOUNTING_DATE_START_BINDING 2021-03-27 06:56:34 +01:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Laurent Destailleur
992e2e0825 Show None if no account found. 2021-03-26 12:27:23 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Alexandre SPANGARO
49faedae6f Work on date_validation 2021-03-24 11:56:23 +01:00
Laurent Destailleur
b275789223 Fix regression 2021-03-23 12:22:30 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
stickler-ci
5af4b4673c Fixing style errors. 2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
976b61456a
Merge pull request #16824 from dolibit-ut/patch-117 
Update fiscalyear_info.php
 2021-03-20 11:57:34 +01:00
Laurent Destailleur
139cd5e8b7
Merge pull request #16823 from dolibit-ut/patch-116 
Update fiscalyear_card.php
 2021-03-20 11:57:24 +01:00
Laurent Destailleur
1230c99629
Merge pull request #16822 from dolibit-ut/patch-115 
Update fiscalyear.php
 2021-03-20 11:53:01 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
UT from dolibit
a0feed2517
Update fiscalyear_info.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:08:55 +01:00
UT from dolibit
19f7b10e4f
Update fiscalyear_card.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:07:27 +01:00
UT from dolibit
6713d9b099
Update fiscalyear.php 
$help_url = "EN:Module_Double_Entry_Accounting";

llxHeader('', $title, $help_url);
 2021-03-19 09:05:49 +01:00
Laurent Destailleur
9a5d1acc1d
Merge pull request #16769 from frederic34/patch-4 
fix php8 warning
 2021-03-18 23:20:43 +01:00
Laurent Destailleur
99f95741d1
Merge pull request #16781 from frederic34/patch-12 
fix php8 warning
 2021-03-18 23:09:22 +01:00
UT from dolibit
569d33392d
Update card.php 
change  $helpurl  -> $help_url

$help_url = 'EN:Category:Accounting';
 2021-03-18 21:49:29 +01:00
Alexandre SPANGARO
18d247026d NEW: Add a sub table to manage product/societe 2021-03-18 17:08:55 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Frédéric FRANCE
f9e1624a78
fix php8 warning 2021-03-17 22:41:18 +01:00
Frédéric FRANCE
340f67fce8
fix php8 warning 2021-03-17 18:23:44 +01:00
Frédéric FRANCE
7b8d1abfcf
fix php8 warnings 2021-03-16 18:04:51 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Laurent Destailleur
765fdff871
Merge pull request #16689 from dolibit-ut/patch-74 
Update thirdparty_lettering_supplier.php
 2021-03-15 17:17:21 +01:00
UT from dolibit
4923bb3577
Update thirdparty_lettering_supplier.php 
-> $help_url add 'DE:Modul_Geschäftspartner'
 2021-03-15 15:40:58 +01:00
UT from dolibit
15f9d07d57
Update thirdparty_lettering_customer.php 
-> $help_url    add   'DE:Modul_Geschäftspartner'
 2021-03-15 15:36:08 +01:00
Frédéric FRANCE
11afb74bae
fix php8 warning 2021-03-14 18:04:51 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Laurent Destailleur
6a5d3bdec2
Merge pull request #16602 from fmarcet/13.0 
FIX: Buttons to disable bindings not working
 2021-03-11 16:05:12 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
Ferran Marcet
1dae21e608 FIX: Buttons to disable bindings not working 2021-03-09 18:44:06 +01:00
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Laurent Destailleur
c1a75d7b70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:39:17 +01:00
Laurent Destailleur
e7da1d7fe4 FIX #16431 2021-02-26 19:38:18 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Frédéric FRANCE
337689d5d2
code syntax 2021-02-22 21:36:42 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
7fd2ac6618 Fix link to show line in pending account 2021-02-22 16:20:13 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +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
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
215752a93c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 14:04:14 +01:00
Alexandre SPANGARO
413fc95f9a FIX: Accountancy - label_operation is used instead of label_compte 2021-01-28 23:40:15 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Alexandre SPANGARO
7670a4f76c Missing file language & uniformize 2021-01-26 04:46:09 +01:00
Laurent Destailleur
33903cb5c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-24 15:30:10 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
8bbf6ce577
Merge pull request #16045 from aspangaro/13a30 
FIX: Accountancy - Search_not_reconciled
 2021-01-24 15:20:58 +01:00
Frédéric FRANCE
5820758968
fix class name Tva 2021-01-23 20:59:23 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
6d0cbd3ee5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-23 17:32:49 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +01:00
Alexandre SPANGARO
77a43c51f9 FIX: Accountancy - Search_not_reconciled 2021-01-22 15:10:23 +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
0598656be7 FIX: Accountancy - Search_not_reconciled 2021-01-21 21:23:31 +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
8076d47b8a FIX #15980 2021-01-21 19:08:03 +01:00
Laurent Destailleur
0f7bdef1c1 FIX in pages of balances 2021-01-21 18:02:17 +01:00
Laurent Destailleur
69e0973c72 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:50:12 +01:00
Laurent Destailleur
47b90ab400 Fix duplicate log 2021-01-17 12:49:37 +01:00
Laurent Destailleur
cdab7041c4 Fix duplicate log 2021-01-17 12:49:01 +01:00
Laurent Destailleur
3cec156158 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:22:10 +01:00
Laurent Destailleur
e3335b5b2c Fix bad class 2021-01-17 12:21:27 +01:00
Laurent Destailleur
05f0576b24 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:18:11 +01:00
Laurent Destailleur
d16e221087 Fix popup 2021-01-17 12:16:56 +01:00
Laurent Destailleur
e7a77525ca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:02:42 +01:00
Laurent Destailleur
10ee98c452 Fix tooltip 2021-01-17 12:02:15 +01:00
Laurent Destailleur
1fe6eccb1c css 2021-01-17 11:46:41 +01:00
Laurent Destailleur
bb6ea8a6cb
Merge pull request #15984 from frederic34/patch-14 
fix merge
 2021-01-16 17:00:12 +01:00
Laurent Destailleur
6d455352a3 Restore change for test 2021-01-15 17:47:39 +01:00
Laurent Destailleur
32bd194f8e Sort array 2021-01-15 17:47:14 +01:00
Laurent Destailleur
8cef8df33a Hide advanced feature with ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-01-15 17:35:16 +01:00
Laurent Destailleur
2970dc2151 Fix warning 2021-01-15 15:14:23 +01:00
Laurent Destailleur
ba37396af2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 14:36:32 +01:00
Laurent Destailleur
82cedd9fd2 Fix filter 2021-01-15 14:36:02 +01:00
Laurent Destailleur
a16fa64596 Fix merge 2021-01-15 11:42:54 +01:00
Frédéric FRANCE
4f67f840bf
fix merge 2021-01-14 14:48:41 +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
Laurent Destailleur
d76aab4d08 Clean code and comment to have code easier to undestand. 2021-01-14 10:56:24 +01:00
Laurent Destailleur
77a094007f Fix parm to url to switch between screen 
Fix error message
Make position of columns more friendly
 2021-01-14 10:34:32 +01:00
Alexandre SPANGARO
dae1794e3d FIX: Accountancy - Export Gestinum_v3 use facnumber for customer invoice 2021-01-13 11:08:33 +01:00
Laurent Destailleur
a72b33367a
Merge pull request #15957 from aspangaro/13b8 
FIX: Accountancy - Piece is a required field for FEC compatibility
 2021-01-12 20:57:20 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Alexandre SPANGARO
19ac498f4e FIX: Accountancy - Piece is a required field for FEC compatibility 2021-01-12 06:03:57 +01:00
Alexandre SPANGARO
5d6ca5c636 FIX: Accountancy - Add translation when journal label data is record 2021-01-12 05:52:47 +01:00
Alexandre SPANGARO
20fba8f4d2 FIX : Accountancy - FEC Export - Add trans & unaccent on journal label 2021-01-12 05:46:24 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5 
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
 2021-01-11 17:10:03 +01:00
Laurent Destailleur
88fdf0491f
Merge pull request #15943 from aspangaro/13b6 
FIX: Hidden accountancy export button without any right
 2021-01-11 16:07:55 +01:00
stickler-ci
7339217cf1 Fixing style errors. 2021-01-11 08:51:52 +00:00
Alexandre SPANGARO
c40976e4f9 FIX: Hidden accountancy export button without any right 2021-01-11 09:47:59 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Alexandre SPANGARO
5606542220 FIX: Accountancy - Add control on required fields when we create an account 2021-01-07 06:59:40 +01:00
Alexandre SPANGARO
74ba7e68da Mix two systems for create and edit account from balance 2021-01-07 06:27:36 +01:00
Alexandre SPANGARO
4077565de9 Merge branch '13.0' into 13b5 2021-01-07 05:27:43 +01:00
Laurent Destailleur
aa05370566 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 21:34:36 +01:00
Laurent Destailleur
ce035eb4ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-06 21:33:59 +01:00
Laurent Destailleur
1aa7e4adeb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 21:32:46 +01:00
atm-lena
4b9bb824d0 FIX balance starting and ending fiscal month #14197 2021-01-06 11:16:51 +01:00
Frédéric FRANCE
58a4249222
clean code 2021-01-05 20:21:15 +01:00
Frédéric FRANCE
76d46652b7
doxygen 2021-01-05 20:17:26 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Alexandre SPANGARO
691e8580cd Add date_export on new ledger & subledger to show edit or delete link when is not export yet 2021-01-03 05:44:07 +01:00
Alexandre SPANGARO
1d5089e95e Repare link to create unknown account 2021-01-03 04:42:21 +01:00
Alexandre SPANGARO
1ebb018903 Add language file 2021-01-03 04:11:25 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Laurent Destailleur
b93c3676d0
Merge pull request #15339 from aspangaro/14a3 
Dev multifilter journal on ledger (complete)
 2020-12-30 23:59:02 +01:00
Laurent Destailleur
bdb261b803
Merge pull request #15840 from frederic34/accountancyadminindex 
remove whitespace
 2020-12-30 23:53:17 +01:00
Laurent Destailleur
020caf8809 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-30 23:52:36 +01:00
Laurent Destailleur
e17d4b8220 Fix total when no data 2020-12-30 23:51:55 +01:00
Laurent Destailleur
1eb8833356 Fix total when no data 2020-12-30 23:39:51 +01:00
Frédéric FRANCE
9916335d93
remove whitespace 2020-12-30 19:17:28 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping 
Dev multifilter jounal on bookeping
 2020-12-30 13:19:27 +01:00
Laurent Destailleur
e5da047134
Update index.php 2020-12-30 13:16:38 +01:00
Laurent Destailleur
1d90717fea
Merge branch '13.0' into paymentsalary 2020-12-30 12:45:57 +01:00
Laurent Destailleur
057ed201a7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-12-30 12:08:12 +01:00
Alexandre SPANGARO
a843d7fac3 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-29 21:10:25 +01:00
Alexandre SPANGARO
2932e2f804 NEW: Accountancy - Add formconfirm with options on export 2020-12-29 04:33:47 +01:00
Alexandre SPANGARO
5001cfce71 NEW: Accountancy - Format FEC - Add new field DateLimitReglmt 2020-12-28 04:12:23 +01:00
Alexandre SPANGARO
abdb3a3f03 Merge remote-tracking branch 'upstream/develop' into 14a3 2020-12-28 03:49:01 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Alexandre SPANGARO
26791714ce Fix : Introduce constant ACCOUNTANCY_SHOW_OPENING_BALANCE 2020-12-28 03:07:33 +01:00
Laurent Destailleur
4a8e72c997 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/file_card.php
 2020-12-27 21:00:07 +01:00
Laurent Destailleur
81ab33ff12 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/product/list.php
 2020-12-27 19:40:03 +01:00
Laurent Destailleur
895f59b9a7
Merge pull request #15765 from aspangaro/13b4 
NEW: Accountancy - In ledger & journals, show link on bank transaction
 2020-12-27 14:34:59 +01:00
Florian HENRY
77c335c5f3 fix colspan balance accountanty 2020-12-23 09:19:56 +01:00
Alexandre SPANGARO
f273273129 FIX: Accountancy - Retire entire opening balance feature 2020-12-22 06:57:55 +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
Laurent Destailleur
ef70bdc307
Merge pull request #15764 from aspangaro/13b3 
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger + CSS
 2020-12-16 15:23:14 +01:00
Alexandre SPANGARO
c5ee976c7e NEW: Accountancy - In ledger & journals, show link on bank transaction 2020-12-16 06:38:17 +01:00
Alexandre SPANGARO
b01a9d6cc3 FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger 2020-12-16 05:32:36 +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
Alexandre SPANGARO
ca6b8176e9 Merge remote-tracking branch 'upstream/develop' into 13b1 2020-12-16 04:32:26 +01:00
Laurent Destailleur
cee63335a2 FIX #15754 Mor complete PR 2020-12-15 13:38:21 +01:00
Alexandre SPANGARO
5ec7b01fb4 FIX: Link to subaccount ledger 2020-12-15 09:34:46 +01:00
Alexandre SPANGARO
31e5709e0b Revert "FIX: Link to subaccount ledger" 
This reverts commit 64fa2120b2.
 2020-12-15 09:32:54 +01:00
Alexandre SPANGARO
64fa2120b2 FIX: Link to subaccount ledger 2020-12-15 08:40:14 +01:00
Alexandre SPANGARO
593f5bcb7a Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-15 06:50:22 +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