Commit Graph

3191 Commits

Author SHA1 Message Date
Laurent Destailleur
49a403b4a5 NEW Can select the export format during export of journals 2023-02-27 20:34:49 +01:00
Laurent Destailleur
b0b1e8d327 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-27 03:40:12 +01:00
Laurent Destailleur
6734f7a6aa Debug v17 Fix #24054 2023-02-27 03:34:49 +01:00
Alexandre SPANGARO
15987bc46f v17 Merge problem - Restore #22762 - Accountancy - Better warning for situation invoice in index 2023-02-25 07:22:20 +01:00
Alexandre SPANGARO
e957e0a945 v17 Merge problem - Restore #22762 - Accountancy - Better warning for situation invoice in index 2023-02-25 07:16:19 +01:00
Laurent Destailleur
1e41c394de
Merge pull request #23977 from frederic34/patch-5
doc
2023-02-22 01:41:17 +01:00
FLIO
29e56ab3cf fix (qodana) edit error and merge develop to be update 2023-02-21 17:51:24 +01:00
Laurent Destailleur
ba70262f04 Fix qodana warnings 2023-02-21 12:37:03 +01:00
Laurent Destailleur
04ca203ee8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-21 12:21:01 +01:00
Laurent Destailleur
88367520f1 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-21 12:19:36 +01:00
Laurent Destailleur
2a9079bd10 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-21 12:17:30 +01:00
Frédéric FRANCE
a6e284ec99
doc 2023-02-20 22:01:57 +01:00
Frédéric FRANCE
9f23bac505 use hasRight 2023-02-20 18:55:52 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Quentin VIAL-GOUTEYRON
a57ad3b96b Merge branch 'FIX_accounting_filter_pgc_version' of github.com:atm-quentin/dolibarr into FIX_accounting_filter_pgc_version 2023-02-20 14:08:50 +01:00
Laurent Destailleur
9322cb28ed Typo 2023-02-20 13:59:46 +01:00
Quentin VIAL-GOUTEYRON
b9fc6d5a2f fix travis 2023-02-20 12:01:42 +01:00
stickler-ci
66b5917013 Fixing style errors. 2023-02-20 10:50:52 +00:00
Quentin VIAL-GOUTEYRON
80199faf1a FIX filter sql accounting account 2023-02-20 11:27:14 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Laurent Destailleur
9b656552dc
Merge pull request #23933 from altairis-melina/code_fourn
NEW : iSuiteExpert export model
2023-02-16 21:01:24 +01:00
Laurent Destailleur
a0c53bc0bc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-14 21:04:44 +01:00
FLIO
156922fc51 Fix (qodana) Incompatible return type 2023-02-14 14:09:56 +01:00
Laurent Destailleur
60231acf0f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-14 11:01:50 +01:00
Laurent Destailleur
e9c5f515ce Fix #huntrb1412070-740e-4119-8e4b-61bdc3af42aa 2023-02-13 14:35:02 +01:00
Mélina JOUM
d034acb3ec add supplier 2023-02-13 12:13:02 +01:00
Laurent Destailleur
5c6d0bc26f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-30 03:01:13 +01:00
Laurent Destailleur
1bbcd3c403 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-30 02:29:43 +01:00
Laurent Destailleur
c4d8268ea5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-30 02:27:28 +01:00
Laurent Destailleur
194f803dbd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-30 02:26:13 +01:00
Laurent Destailleur
d03ec374d0 NEW Can set a checkbox in formconfirm by clicking on the label 2023-01-30 02:21:54 +01:00
Alexandre SPANGARO
791a69dd09 FIX Accountancy - Quadra export 2023-01-28 04:48:55 +01:00
Laurent Destailleur
a6daba61ce Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-26 02:32:08 +01:00
Laurent Destailleur
5429882147 Debug v17 2023-01-24 18:23:46 +01:00
Laurent Destailleur
fe6d9730cd Fix messages to avoid confusion. 2023-01-24 16:58:35 +01:00
Laurent Destailleur
5b5a3547e2 Debug v17 2023-01-24 13:00:09 +01:00
Laurent Destailleur
c463f0972d Clean code 2023-01-24 12:15:57 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
3248f06045
Merge pull request #23568 from dolibit-ut/patch-642
Update subaccount.php
2023-01-18 20:24:09 +01:00
Laurent Destailleur
2d2164550f Fix warnings 2023-01-15 20:48:29 +01:00
stickler-ci
5fef3398fd Fixing style errors. 2023-01-14 17:36:09 +00:00
UT from dolibit
64ecdd0632
Update subaccount.php 2023-01-14 18:35:09 +01:00
Laurent Destailleur
3e273d4004 Debug v17 2023-01-14 15:47:22 +01:00
Laurent Destailleur
db56ef9090 Fix sql error 2023-01-11 21:32:01 +01:00
Laurent Destailleur
99a58dc6db
Merge pull request #23479 from aspangaro/18a2
NEW Accountancy - Add sub-account balance FPC22
2023-01-11 21:23:09 +01:00
Laurent Destailleur
92a8156441 Fix link 2023-01-10 11:03:41 +01:00
Laurent Destailleur
919849ab08 Fix link 2023-01-10 10:48:26 +01:00
Laurent Destailleur
04a216bf62 Debug and clean link page 2023-01-10 10:39:07 +01:00
Laurent Destailleur
81d2c7fa0e NEW Can bin accounting line for a given month 2023-01-10 10:21:36 +01:00
Alexandre SPANGARO
1c3d4f9301 Add warning 2023-01-10 09:09:39 +01:00
Alexandre SPANGARO
a85e1c4694 Remove link 2023-01-10 08:49:09 +01:00
Alexandre SPANGARO
6d26f242bb Merge remote-tracking branch 'upstream/develop' into 18a2 2023-01-10 05:46:00 +01:00
Alexandre SPANGARO
cce5741aca NEW Accountancy - Add sub-account balance - FPC22 2023-01-10 05:45:47 +01:00
Laurent Destailleur
ab870d99c1
Merge pull request #21196 from aspangaro/17p3
NEW Accountancy - Manage customer retained warranty FPC21+
2023-01-08 14:53:43 +01:00
Laurent Destailleur
4336b188c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-01-07 17:36:52 +01:00
Laurent Destailleur
def29ac9f9 Fix style 2023-01-07 17:26:57 +01:00
Alexandre SPANGARO
81a8838070 Add a condition to show option 2023-01-07 14:06:20 +01:00
Alexandre SPANGARO
183552461c NEW Accountancy - Add an option to disable autolettering when transferring to accounting 2023-01-07 08:20:48 +01:00
daraelmin
8d922d8934
New Accountancy - 2 line for 1 mvmt in create mode 2023-01-07 00:24:57 +01:00
Laurent Destailleur
b3b0fe2444 Clean code 2023-01-06 20:12:58 +01:00
Laurent Destailleur
0feac89942
Merge pull request #23209 from Easya-Solutions/new-accountancy-export-quadatus-with-archive
NEW Quadratus export with attachments in accountancy export
2023-01-04 07:53:52 +01:00
Laurent Destailleur
fce5968510 Fix warning 2023-01-03 17:09:08 +01:00
Laurent Destailleur
00fa438c05 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-03 02:40:22 +01:00
Laurent Destailleur
496cff0167 Debug v17 2023-01-03 02:36:53 +01:00
Laurent Destailleur
ea42fc7605 Clean code, fix warnings 2022-12-30 18:43:43 +01:00
Laurent Destailleur
dab6b5f8a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 12:15:46 +01:00
Laurent Destailleur
32c161e576 Fix warnings 2022-12-30 12:10:23 +01:00
VESSILLER
ed1c0897ed NEW copyrights 2022-12-30 10:59:45 +01:00
Laurent Destailleur
8d64f8617c Clean code 2022-12-30 01:52:41 +01:00
Laurent Destailleur
dd4810aef6 Fix escape 2022-12-30 01:40:09 +01:00
Laurent Destailleur
f99fa791b2 Fix rounding 2022-12-30 01:24:24 +01:00
Laurent Destailleur
9d777497db NEW dol_sort_array can sort on alphabetical order even if val is num 2022-12-29 22:07:26 +01:00
Laurent Destailleur
e9d66286e0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-29 20:29:07 +01:00
Laurent Destailleur
bcd5c207cf Debug v17 - Fix the report on custom groups, column previous period 2022-12-29 20:25:53 +01:00
Laurent Destailleur
ba7fab6ac4 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-29 18:24:47 +01:00
Laurent Destailleur
429b38a2e6 Fix sort 2022-12-29 17:48:16 +01:00
Laurent Destailleur
13a19037dd NEW sort of column of custom group of account 2022-12-29 17:38:01 +01:00
Laurent Destailleur
a7c2d72315 NEW Can filter on a custom group of accounts. Perf or ledger list. 2022-12-29 16:39:27 +01:00
Laurent Destailleur
f7f140f003 css 2022-12-28 23:39:46 +01:00
Laurent Destailleur
ec95c64024 Clean code 2022-12-28 23:23:32 +01:00
Laurent Destailleur
aea48e87de Clean code 2022-12-28 23:20:42 +01:00
Laurent Destailleur
77d6b9510b Clean code 2022-12-28 13:04:11 +01:00
Laurent Destailleur
b73df9724d First test of qodana 2022-12-27 18:18:23 +01:00
VESSILLER
298c97d5a6 NEW copyrights 2022-12-23 12:43:26 +01:00
Manny Isles
b0bf5d8298 I think it should be $obj->rowid
I think it should be $obj->rowid because when its `$obj->id` then it goes nowhere.
2022-12-22 14:35:59 +01:00
Laurent Destailleur
604e15de67
Merge pull request #23251 from mannysoft/patch-1
I think it should be $obj->rowid
2022-12-22 14:35:20 +01:00
Laurent Destailleur
e1093b541e Fix look and feel 2022-12-22 03:56:08 +01:00
Laurent Destailleur
2959704b80 Fix look and feel 2022-12-22 03:54:53 +01:00
Laurent Destailleur
46db4b51d1 FIX Debug v17 2022-12-22 03:08:41 +01:00
Laurent Destailleur
242713bb97 FIX Duplicate test 2022-12-22 03:08:28 +01:00
Laurent Destailleur
44f1699683 FIX Debug v17 2022-12-22 03:06:53 +01:00
Laurent Destailleur
b2c27cc856 FIX Duplicate test 2022-12-22 02:11:05 +01:00
Laurent Destailleur
3968161686 Fix filter on active on list of account 2022-12-22 01:44:04 +01:00
Laurent Destailleur
7318fb1903 Fix filter on active on list of account 2022-12-22 01:42:53 +01:00
Manny Isles
49de4dcda6
I think it should be $obj->rowid
I think it should be $obj->rowid because when its `$obj->id` then it goes nowhere.
2022-12-19 15:37:35 +08:00
Laurent Destailleur
c489dbacfc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-17 11:43:49 +01:00
Laurent Destailleur
a601e12c1c Trans 2022-12-17 11:42:07 +01:00
VESSILLER
b0e4b4b18e FIX sql when discount is applied 2022-12-14 17:30:42 +01:00
VESSILLER
341bc115ee NEW accountancy bank journal when deposits are just payments is enabled 2022-12-14 15:43:34 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
7ca850830a FIX #23212 2022-12-13 23:51:23 +01:00
VESSILLER
fb16a97d6d FIX stickler-ci 2022-12-13 18:13:24 +01:00
VESSILLER
787618d9d6 NEW Copyrights 2022-12-13 16:36:49 +01:00
VESSILLER
6dedeb368d NEW Quadratus export with attachments in accountancy export 2022-12-13 15:51:23 +01:00
VESSILLER
88ab5d7203 NEW Quadratus export with attachments in accountancy export 2022-12-13 15:48:00 +01:00
Laurent Destailleur
1848e6e92c Fix do not show 0 debit/credit 2022-12-13 14:34:17 +01:00
Laurent Destailleur
09137d6cd2 Log 2022-12-13 14:34:04 +01:00
Laurent Destailleur
9d527d7aef css 2022-12-13 14:33:48 +01:00
Quentin-Seekness
1d8cf1b44f
Add filter params 2022-12-13 11:29:28 +01:00
Quentin-Seekness
d98c998b8e
Adding filter parameters
Adding filter parameters in addMoreActionsButtonsList Hook
2022-12-13 11:26:53 +01:00
Laurent Destailleur
285a5e38f1 Debug v17 2022-12-09 18:06:15 +01:00
Laurent Destailleur
5026de62f7 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-01 17:48:29 +01:00
Laurent Destailleur
804b806d02 Fix responsive 2022-12-01 11:37:56 +01:00
Laurent Destailleur
e5176a78f5 Need 2 different translations for Debit-Credit in some pages for Italia 2022-11-30 18:56:16 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:43:09 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:21:51 +01:00
Laurent Destailleur
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
Noé Courtier
863a56c02c Merge branch '14_FIX_Add_Footer_HookAccountancy' of github.com:noec764/dolibarr into 14_FIX_Add_Footer_HookAccountancy 2022-11-25 16:51:19 +01:00
Noé Courtier
acf629ad1c Merge branch 'develop' of github.com:Dolibarr/dolibarr into 14_FIX_Add_Footer_HookAccountancy 2022-11-25 16:50:23 +01:00
hystepik
efc1697c62 fix : php8.1 warnings 2022-11-25 15:34:38 +01:00
stickler-ci
ec156ddf84 Fixing style errors. 2022-11-25 11:26:31 +00:00
Noé Courtier
043b2e9ea3 FIX: copy same behaviour in other accountancy files 2022-11-25 12:18:32 +01:00
Noé Courtier
2ada053855 FIX: Use the Hook addMoreActionsButtons resPrint 2022-11-25 11:44:34 +01:00
Laurent Destailleur
da8d6d958a
Update list.php 2022-11-22 21:56:46 +01:00
Faustin
9c64a21bd9 checkbox colum on left for ledger list 2022-11-19 23:38:13 +01:00
Faustin
306d0c0b3a checkbox colum on left for journals list 2022-11-19 23:32:45 +01:00
stickler-ci
b4f7dcafcf Fixing style errors. 2022-11-17 14:35:43 +00:00
Noé Courtier
40953db988 Fix: Add also 2022-11-17 15:30:45 +01:00
Noé Courtier
049029689f Fix: Add Hook on Accountancy List Footer 2022-11-17 14:40:30 +01:00
Laurent Destailleur
0a9381f2d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-11-16 20:35:29 +01:00
Alexandre SPANGARO
e604d18d01 FIX #22824 Accountancy - Journal - Search on subledger when list of subledger is disabled 2022-11-14 22:10:15 +01:00
Alexandre SPANGARO
cca1839ab8 Use getDolGlobalString 2022-11-12 15:30:18 +01:00
Alexandre SPANGARO
49a2e95bff Merge remote-tracking branch 'upstream/develop' into 17b11 2022-11-12 15:21:14 +01:00
Laurent Destailleur
43f9ac59d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-11 15:34:10 +01:00
Laurent Destailleur
cba92c8bdd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-11 15:28:04 +01:00
Alexandre SPANGARO
7c77c321c3 Merge remote-tracking branch 'upstream/develop' into 17p3 2022-11-10 02:23:38 +01:00
Alexandre SPANGARO
2469cff773 FIX Accountancy - When origin invoice is deposit, suggest specific account on credit note 2022-11-10 02:15:30 +01:00
Alexandre SPANGARO
36b8668648 FIX Accountancy - When origin invoice is deposit, suggest specific account on credit note 2022-11-10 02:02:04 +01:00
Alexandre SPANGARO
758209b6f4 Merge remote-tracking branch 'upstream/develop' into 17b11 2022-11-10 02:01:19 +01:00
Alexandre SPANGARO
9c069b045b FIX Accountancy - When origin invoice is deposit, suggest specific account on credit note 2022-11-10 01:20:08 +01:00
Laurent Destailleur
125af0867b
Merge pull request #22761 from aspangaro/17b12
NEW Accountancy - Add a graphic option to enable lettering function - FPC21
2022-11-09 18:51:06 +01:00
Alexandre SPANGARO
9d1793b454 FIX Accountancy - Journal - HTML in title 2022-11-08 03:40:38 +01:00
Laurent Destailleur
ddf60b399e Fix better separation label journal and label transfer 2022-11-07 21:48:52 +01:00
Laurent Destailleur
6fc8025244
Merge pull request #22771 from aspangaro/17b15
FIX Accountancy - the pages of generations of entries are not journals, this term must be removed
2022-11-07 19:40:34 +01:00
Alexandre SPANGARO
570a75b3d6 Fix separator 2022-11-07 18:50:21 +01:00
Laurent Destailleur
688e8fe768
Merge pull request #22760 from aspangaro/17b11
NEW Accountancy - Added an option during export to export or not the lettering FPC21
2022-11-07 18:49:01 +01:00
Alexandre SPANGARO
1da35b9d92 Merge remote-tracking branch 'upstream/develop' into 17b14 2022-11-06 17:10:58 +01:00
Alexandre SPANGARO
a3e34f20e0 Merge remote-tracking branch 'upstream/develop' into 17b15 2022-11-06 17:07:38 +01:00
Alexandre SPANGARO
13c7ddddbf FIX Accountancy - the pages of generations of entries are not journals, this term must be removed 2022-11-06 16:51:12 +01:00
Alexandre SPANGARO
b1db74d9f0 FIX Accountancy - Delete operation - Problem on SELECT 2022-11-06 14:35:17 +01:00