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

3191 Commits

Author SHA1 Message Date
Alexandre SPANGARO
221ce01cdc FIX Accountancy - Better warning for situation invoice in index 2022-11-05 08:02:56 +01:00
Alexandre SPANGARO
578b63fea6 NEW Accountancy - Add a graphic option to enable lettering function 2022-11-05 05:16:18 +01:00
Alexandre SPANGARO
df3580687c NEW Accountancy - Added an option during export to export or not the lettering 2022-11-05 04:38:12 +01:00
Laurent Destailleur
88273690c5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2022-11-02 00:24:08 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
 2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
 2022-11-02 00:15:21 +01:00
Alexandre SPANGARO
d3d55240f9 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 08:00:37 +01:00
Alexandre SPANGARO
4bd9bdaccd FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 07:56:24 +01:00
Alexandre SPANGARO
f45f3740e2 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-10-28 08:10:39 +02:00
Laurent Destailleur
6530f3a1cd CSS 2022-10-24 12:28:11 +02:00
Laurent Destailleur
692be6889a Responsive 2022-10-24 11:04:40 +02:00
Laurent Destailleur
a53a3fb9bf Look and feel v17, search on multibox not too large 2022-10-24 10:26:46 +02:00
Laurent Destailleur
e507eac37d Fix consistency of test 2022-10-19 17:35:40 +02:00
Laurent Destailleur
eb0f898b01 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-13 01:10:31 +02:00
Laurent Destailleur
020d3dcbe5 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 12:14:04 +02:00
Laurent Destailleur
77898ab456 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 11:52:33 +02:00
Laurent Destailleur
ae4f8b23d5 Standardize code for action buttons Delete 2022-10-10 11:39:50 +02:00
Laurent Destailleur
a0fed08272 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-08 02:56:52 +02:00
Laurent Destailleur
77301c50ee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-08 02:55:55 +02:00
Alexandre SPANGARO
b47f5cd19d Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-06 17:30:38 +02:00
ksar
ce7f553f7d
FIX #22507 2022-10-06 16:06:33 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
Laurent Destailleur
cebba515ad
Merge pull request #22403 from grandoc/new_branch_25_09_2022 
update code toward php8 compliance
 2022-10-04 18:05:47 +02:00
thibdrev
2801dd6221
Update lines.php 2022-10-03 16:42:00 +02:00
Alexandre SPANGARO
4ef080dbe0 Update SQL with EXISTS 2022-10-01 08:15:14 +02:00
Alexandre SPANGARO
7b8ed8dfc5 Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-01 08:06:52 +02:00
stickler-ci
6b4cf5c8d9 Fixing style errors. 2022-09-28 20:39:47 +00:00
Regis Houssin
36c54a140f FIX compatibility with Mysql <= 5.7 2022-09-28 22:32:55 +02:00
Philippe GRAND
d891b20f90 fix test fiffers 2022-09-28 21:15:37 +02:00
Regis Houssin
ee34b6d8f5 FIXME sql error 2022-09-27 09:39:37 +02:00
Philippe GRAND
52b973209e fix Test differs 2022-09-25 19:06:55 +02:00
Philippe GRAND
f2e7e0b210 update code toward php8 compliance 2022-09-25 18:02:48 +02:00
Philippe GRAND
7732fabd80 update code toward php8 compliance 2022-09-25 18:00:07 +02:00
Philippe GRAND
7d018797d0 update code toward php8 compliance 2022-09-25 17:55:06 +02:00
Philippe GRAND
c0ca275470 update code toward php8 compliance 2022-09-25 17:51:43 +02:00
Philippe GRAND
608dda677a update code toward php8 compliance 2022-09-25 17:44:29 +02:00
Philippe GRAND
1ab58434c2 update code toward php8 compliance 2022-09-25 17:41:42 +02:00
Laurent Destailleur
d33ff9b65a
Merge pull request #22180 from dolibit-ut/patch-553 
Update index.php
 2022-09-25 17:21:19 +02:00
Laurent Destailleur
8952530fad
Merge pull request #22184 from fboitel/fboitel-dev-scrutinizer-10/09/2022 
Fix scrutinizer 1
 2022-09-25 17:17:48 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Laurent Destailleur
cff5f9c330 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 16:57:53 +02:00
Laurent Destailleur
be770eefdc
Update bookkeeping.class.php 2022-09-25 13:04:04 +02:00
Alexandre SPANGARO
ecb6814e89 FIX Accountancy - Some manuals operations are displayed in subledger 2022-09-25 06:42:51 +02:00
Laurent Destailleur
a893ab39c4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 11:59:43 +02:00
Laurent Destailleur
dcf7ce4cfc Fix sort 2022-09-21 11:57:11 +02:00
Laurent Destailleur
f3ae54f8ac Fix sort order 2022-09-21 11:40:28 +02:00
Laurent Destailleur
45c4a6ce1c Fix regression using confirm as POST (pb with cursor and download file) 2022-09-21 11:11:56 +02:00
Laurent Destailleur
71a9cda8a2 FIX missing token in export_file of accountancy 2022-09-21 10:24:22 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Alexandre SPANGARO
6fa428df41 Fix comment for parameter 2022-09-15 09:30:01 +02:00
stickler-ci
1cd4f4ed8d Fixing style errors. 2022-09-15 04:36:08 +00:00
Alexandre SPANGARO
498ded7712 Fix PHP8 Warning 2022-09-15 06:33:38 +02:00
Alexandre SPANGARO
7236c94640 Fix PHP8 Warning 2022-09-15 06:33:32 +02:00
Alexandre SPANGARO
4d8c41a371 Fix PHP8 Warning 2022-09-15 06:33:19 +02:00
Alexandre SPANGARO
373449900f FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) 2022-09-15 05:21:22 +02:00
Faustin
349e33592d scrutinizer in accountancy/class/accountingaccount.class.php: variable not always defined 2022-09-10 14:09:58 +02:00
Philippe GRAND
1b5465d7d0 update code toward php8 compliance 2022-09-10 11:19:54 +02:00
Philippe GRAND
236b86bdd3 update code toward php8 compliance 2022-09-10 11:18:31 +02:00
UT from dolibit
06ea3d3ae1
Update index.php 
$help_url
 2022-09-10 11:06:34 +02:00
Philippe GRAND
857646ed36 update code toward php8 compliance 2022-09-10 11:00:38 +02:00
Laurent Destailleur
767897595b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-10 02:46:10 +02:00
Laurent Destailleur
a538609c9c Fix more complete filters supported in fetchAllBalance 2022-09-10 02:26:49 +02:00
Laurent Destailleur
689a1df761
Merge pull request #22100 from grandoc/new_branch_06_09_2022 
update code
 2022-09-09 18:04:27 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
Laurent Destailleur
b23ab2cb71 FIX #yogosha12266 2022-09-09 13:58:54 +02:00
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Laurent Destailleur
c5d5a963cb Fix preselected country 2022-09-09 00:38:16 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Philippe GRAND
3a5abf12bc update code 2022-09-06 16:40:07 +02:00
Philippe GRAND
644a23a0ac update code 2022-09-06 16:38:08 +02:00
Philippe GRAND
e04b7333b1 update code 2022-09-06 16:37:06 +02:00
Philippe GRAND
eccd46c5c5 update code 2022-09-06 16:35:35 +02:00
Laurent Destailleur
6e5b1af6ec
Merge pull request #22008 from frederic34/productbatch 
fix php8 warnings
 2022-09-02 10:30:19 +02:00
Laurent Destailleur
459558bd9b
Merge pull request #22004 from hregis/fix_missing_hook_context 
FIX missing hook context and some parameters
 2022-09-02 10:17:51 +02:00
Thomas Negre
ce78e0164a Fix: When a custom compta group would be unactive, its code would stay in the computed formula. This would lead to wrong totals if the code is a number. 2022-09-01 17:49:05 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Regis Houssin
92f9f36dd6 FIX add hook formobjectoptions 2022-08-31 18:39:41 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Regis Houssin
55dcf19efd FIX missing hook context and some parameters 2022-08-31 17:22:06 +02:00
Laurent Destailleur
499810c822 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-30 18:46:31 +02:00
Laurent Destailleur
52b912aa51 Clean code 2022-08-30 18:46:10 +02:00
Laurent Destailleur
87df13507c
Update categories.php 2022-08-30 01:21:49 +02:00
UT from dolibit
2f9bb23a12
Update index.php 2022-08-29 19:00:39 +02:00
Alexandre SPANGARO
32a6f3f756 PHP8 Warnings 2022-08-29 05:48:18 +02:00
Alexandre SPANGARO
3ec7a27960 PHP8 Warnings 2022-08-29 05:43:33 +02:00
Alexandre SPANGARO
4159aab038 PHP8 Warnings 2022-08-29 05:43:25 +02:00
Alexandre SPANGARO
f59795224f PHP8 Warnings 2022-08-29 05:26:57 +02:00
Alexandre SPANGARO
6f9305cb58 PHP8 Warning 2022-08-29 05:18:15 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
 2022-08-25 14:35:08 +02:00
Laurent Destailleur
df3b56b90a
Merge pull request #21883 from dolibit-ut/patch-429 
Update account.php
 2022-08-25 12:12:23 +02:00
Laurent Destailleur
ed7e564146
Merge pull request #21884 from dolibit-ut/patch-430 
Update accountmodel.php
 2022-08-25 12:10:59 +02:00
UT from dolibit
f5e8b6b0b2
Update card.php 2022-08-24 23:39:27 +02:00
UT from dolibit
c9693d266f
Update accountmodel.php 2022-08-24 23:38:05 +02:00
UT from dolibit
dedf039f3f
Update account.php 2022-08-24 23:35:16 +02:00
Alexandre SPANGARO
20f73ac369 Use isModEnabled 2022-08-24 10:44:57 +02:00
Alexandre SPANGARO
149f7d8e6a Use isModEnabled 2022-08-24 10:44:52 +02:00
Alexandre SPANGARO
01631a251c Use isModEnabled 2022-08-24 10:34:31 +02:00
Alexandre SPANGARO
83da806172 Use isModEnabled 2022-08-24 10:34:25 +02:00
Alexandre SPANGARO
8f41a59fce Use isModEnabled 2022-08-24 10:34:19 +02:00
Alexandre SPANGARO
282c0d9f13 Use isModEnabled 2022-08-24 10:34:12 +02:00
Alexandre SPANGARO
3c67bfc539 Fix 2022-08-24 10:34:04 +02:00
Alexandre SPANGARO
151c46bcc8 Merge branch '16.0' into 16p1 2022-08-24 10:29:57 +02:00
Alexandre SPANGARO
4440404eed Use isModEnabled 2022-08-24 10:26:47 +02:00
Alexandre SPANGARO
1a3a614321 Use isModEnabled 2022-08-24 10:26:42 +02:00
Alexandre SPANGARO
2eacf9c26e Use isModEnabled 2022-08-24 10:26:33 +02:00
Alexandre SPANGARO
71acad3a81 Use isModEnabled 2022-08-24 10:26:27 +02:00
Alexandre SPANGARO
a75cf794e5 Use isModEnabled 2022-08-24 10:26:22 +02:00
Alexandre SPANGARO
6c0330a5fa Use isModEnabled 2022-08-24 10:26:16 +02:00
Alexandre SPANGARO
fcdc88437d Use isModEnabled 2022-08-24 10:26:09 +02:00
Alexandre SPANGARO
26a8ba5278 Use isModEnabled 2022-08-24 10:26:04 +02:00
Philippe GRAND
cb4b0dbd54 FIX php8 compatibility 2022-08-23 09:53:10 +02:00
Laurent Destailleur
f040900c3b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-23 01:02:30 +02:00
Laurent Destailleur
45683d43d3
Merge pull request #21821 from aspangaro/17p2 
NEW Accountancy - Manage supplier deposit with specific account
 2022-08-22 23:50:44 +02:00
Laurent Destailleur
3b3ea5eea3 Fix typo 2022-08-22 23:50:21 +02:00
Alexandre SPANGARO
d652384f3c Fix admin 2022-08-22 21:55:00 +02:00
Philippe GRAND
9e69ab1153 FIX php8 compatibility 2022-08-22 14:01:19 +02:00
Philippe GRAND
7995f88355 FIX php8 compatibility 2022-08-22 13:59:56 +02:00
Philippe GRAND
dbf51e7937 FIX php8 compatibility 2022-08-22 13:55:40 +02:00
Alexandre SPANGARO
bb786d5ab9 NEW Accountancy - Manage supplier deposit with specific account 2022-08-21 08:06:04 +02:00
Alexandre SPANGARO
d33573bf05 PHP8 Warnings Accountancy - Balance 2022-08-19 07:02:52 +02:00
Philippe GRAND
710b66cd02 FIX php8 compatibility 2022-08-16 17:22:41 +02:00
Philippe GRAND
653ce52713 FIX php8 compatibility 2022-08-16 17:22:13 +02:00
Philippe GRAND
b2c0dae216 FIX php8 compatibility 2022-08-16 17:21:49 +02:00
Philippe GRAND
8bdff211c4 FIX php8 compatibility 2022-08-16 17:21:18 +02:00
Philippe GRAND
f94e2b3fe9 FIX php8 compatibility 2022-08-16 17:20:38 +02:00
Philippe GRAND
b6170450d0 FIX php8 compatibility 2022-08-16 17:20:03 +02:00
Philippe GRAND
aea9cc7f93 FIX php8 compatibility 2022-08-16 17:19:30 +02:00
Philippe GRAND
a8a5ed00ec FIX php8 compatibility 2022-08-16 17:19:01 +02:00
Philippe GRAND
709d6732ae FIX php8 compatibility 2022-08-16 17:18:24 +02:00
Philippe GRAND
42459ea7b9 FIX php8 compatibility 2022-08-16 17:17:54 +02:00
Philippe GRAND
46abe5bea0 FIX php8 compatibility 2022-08-16 17:17:29 +02:00
Philippe GRAND
bab68b179b FIX php8 compatibility 2022-08-16 17:17:01 +02:00
Philippe GRAND
a7c8960e2f FIX php8 compatibility 2022-08-16 17:16:30 +02:00
Philippe GRAND
1742a8bebd FIX php8 compatibility 2022-08-16 17:16:02 +02:00
Philippe GRAND
debeb04f28 FIX php8 compatibility 2022-08-16 17:15:23 +02:00
Philippe GRAND
ee193d766a FIX php8 compatibility 2022-08-16 17:13:43 +02:00
Philippe GRAND
bf013aad63 FIX php8 compatibility 2022-08-16 17:13:02 +02:00
Philippe GRAND
7e9547c762 FIX php8 compatibility 2022-08-16 17:12:27 +02:00
Philippe GRAND
f3ee3319dd FIX php8 compatibility 2022-08-16 17:11:21 +02:00
Philippe GRAND
fc440f90a0 FIX php8 compatibility 2022-08-16 17:10:41 +02:00
Philippe GRAND
919408f9d1 FIX php8 compatibility 2022-08-16 17:09:40 +02:00
Philippe GRAND
44e8c99b82 FIX php8 compatibility 2022-08-16 17:08:42 +02:00
Philippe GRAND
ea8f70c73a FIX php8 compatibility 2022-08-16 17:07:35 +02:00
Philippe GRAND
ce89faace2 FIX php8 compatibility 2022-08-16 17:06:36 +02:00
Philippe GRAND
a9aad43001 FIX php8 compatibility 2022-08-16 17:04:24 +02:00
Philippe GRAND
6e4dfdade8 FIX php8 compatibility 2022-08-16 17:01:07 +02:00
Laurent Destailleur
1b15d083a1
Merge branch 'develop' into new_branch_12_08_2022 2022-08-14 16:41:08 +02:00
Laurent Destailleur
72c010622b FIX empty with hasRight and add phpunit to avoid this in future 2022-08-14 16:38:20 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
75fa3cf643 Debug v16 2022-08-12 15:45:27 +02:00
Philippe GRAND
a9b6d97217 update code for PHP8 compliance 2022-08-12 09:15:32 +02:00
Philippe GRAND
6298dc2f0d update code for PHP8 compliance 2022-08-12 09:14:58 +02:00
Philippe GRAND
d9dcecb6be update code for PHP8 compliance 2022-08-12 09:14:41 +02:00
Philippe GRAND
71f138caba update code for PHP8 compliance 2022-08-12 09:13:52 +02:00
Philippe GRAND
723d90f33f update code for PHP8 compliance 2022-08-12 09:13:34 +02:00
Philippe GRAND
29cb0ce687 update code for PHP8 compliance 2022-08-12 09:13:12 +02:00
Philippe GRAND
a698c60a7d update code for PHP8 compliance 2022-08-12 09:12:09 +02:00
stickler-ci
3d45d9897a Fixing style errors. 2022-08-11 07:40:32 +00:00
Philippe GRAND
c9c5204923 update code for PHP8 compliance 2022-08-11 09:39:29 +02:00
Philippe GRAND
79830bee9e update code for PHP8 compliance 2022-08-09 10:57:58 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
e9892fdc32 css 2022-07-24 15:47:55 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Laurent Destailleur
e9c42bf715 Add option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2022-07-24 11:15:44 +02:00
Laurent Destailleur
8c5554a6e6 Add option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE 2022-07-24 11:09:59 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
 2022-07-22 17:43:35 +02:00
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/product/inventory/inventory.php
 2022-07-22 17:38:24 +02:00
Alexandre SPANGARO
e9ae888fc7 FIX Accountancy - Label of VAT account is empty 2022-07-22 16:01:39 +02:00
Alexandre SPANGARO
be491cc6cf FIX Accountancy - Model account list - Problem of CSRF 2022-07-15 16:22:22 +02:00
Laurent Destailleur
6f1d62d8a5 Fix trans 2022-07-11 17:06:03 +02:00
Laurent Destailleur
0f221b5f7c Fix php8 2022-07-11 12:12:18 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Alexandre SPANGARO
bda01fc2d1 Merge remote-tracking branch 'upstream/develop' into 17p3 2022-07-03 07:33:43 +02:00
Laurent Destailleur
67ade177c7 Fix error message 2022-06-28 20:11:18 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
0091c31b99 Debug v16 2022-06-28 11:07:06 +02:00
Laurent Destailleur
bbd2f05e3a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2022-06-27 12:11:40 +02:00
Laurent Destailleur
6e5cbd9f08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-27 12:09:42 +02:00
daraelmin
e381e646b3
Fix css class declared in wrong param 
In print_liste_field_titre CSS class name can only be added in prefix parameter (except 'class="right"' for backward compatibility)
If the title is centered, the field should be also
 2022-06-25 21:22:30 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +02:00
Alexandre SPANGARO
e6a9d48e71 Fix code error 2022-06-19 06:41:05 +02:00
Alexandre SPANGARO
4768502773 Merge remote-tracking branch 'upstream/develop' into 16b2 2022-06-19 06:35:49 +02:00
Laurent Destailleur
18cf0c7a18 Debug v16 2022-06-17 18:57:09 +02:00
Laurent Destailleur
014a62a3a7
Merge branch 'develop' into Fix_accountancy_supplier_index_14 2022-06-17 17:23:55 +02:00
Laurent Destailleur
614ebfeadc
Update index.php 2022-06-17 17:20:12 +02:00
Laurent Destailleur
75b50023bf
Update index.php 2022-06-17 17:18:05 +02:00
Laurent Destailleur
dd96f6d8d2
Update index.php 2022-06-17 17:17:29 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-06-17 14:52:51 +02:00
Laurent Destailleur
18d9d6194e # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-06-17 14:48:27 +02:00
Alexandre SPANGARO
a49062338f Copyright 2022-06-17 04:41:15 +02:00
Alexandre SPANGARO
54a5967a71 FIX Accountancy - Partitioning of the entity on an automatic binding 2022-06-17 04:37:56 +02:00
Laurent Destailleur
12ee8eb40b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2022-06-13 13:32:11 +02:00
Alexandre SPANGARO
e2c9f62796 Fix PHP 8.1.7 2022-06-12 22:58:20 +02:00
Alexandre SPANGARO
05cad50f0e Merge branch '16b2' of https://github.com/aspangaro/dolibarr into 16b2 2022-06-12 22:49:20 +02:00
Alexandre SPANGARO
7cd6df4745 Fix PHP 8.1.7 2022-06-12 22:49:05 +02:00
stickler-ci
5f298f7f69 Fixing style errors. 2022-06-12 20:39:25 +00:00
Alexandre SPANGARO
70e8210339 Fix PHP 8.1.7 2022-06-12 22:33:58 +02:00
Alexandre SPANGARO
c96b6b0bc7 Fix PHP 8.1.7 2022-06-12 22:30:24 +02:00
Alexandre SPANGARO
4f27d7e760 Fix PHP 8.1.7 2022-06-12 22:26:16 +02:00
Alexandre SPANGARO
274dd343f7 Fix PHP 8.1.7 2022-06-12 22:26:12 +02:00
Alexandre SPANGARO
2865b72b65 Fix PHP 8.1.7 2022-06-12 21:56:15 +02:00
Alexandre SPANGARO
ae55ff6a43 Fix PHP 8.1.7 2022-06-12 21:50:09 +02:00
Alexandre SPANGARO
7e3a6116bf Remove patch - Error 2022-06-12 21:30:12 +02:00
Alexandre SPANGARO
6309dbe99b Fix PHP 8.1.7 2022-06-12 07:38:49 +02:00
Alexandre SPANGARO
02f21fae78 Fix PHP 8.1.7 - $newcardbutton not defined 2022-06-12 07:33:28 +02:00
Alexandre SPANGARO
590cb20b41 Fix PHP 8.1.7 - $search_country_id not defined 2022-06-12 07:30:09 +02:00
Alexandre SPANGARO
7967ab402a Fix PHP 8.1.7 2022-06-12 07:19:08 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
stickler-ci
a1cec27540 Fixing style errors. 2022-06-10 02:53:13 +00:00
Alexandre SPANGARO
4fecd01ddd NEW Accountancy - Manage customer retained warranty 2022-06-10 04:47:15 +02:00
Frédéric France
0b8179d7ef use isModEnabled function 2022-06-09 22:49:48 +02:00
Alexandre SPANGARO
82d1cb4682 FIX #20527 Accountancy Unbalanced entry proposed when an employee are declared on social contribution 2022-06-09 17:30:16 +02:00
Laurent Destailleur
648f4b1d8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 12:51:02 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Laurent Destailleur
974a1c2c6d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-09 12:48:51 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
aeb4287d25
Merge pull request #21143 from fboitel/14.0 
FIX #20696
 2022-06-09 03:11:23 +02:00
Laurent Destailleur
1ae708ae9a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 03:10:37 +02:00
Laurent Destailleur
8280447f3e # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-06-09 03:09:37 +02:00
Laurent Destailleur
900c71b5d6 Fix can add an empty line in tmp edit mode of transation 2022-06-09 03:07:11 +02:00
Laurent Destailleur
e10d89dd36 Fix regression 2022-06-09 03:00:51 +02:00
Faustin
f0a8765ee6 FIX #20696 2022-06-08 16:05:44 +02:00
daraelmin
0641b66118
Clean code 2022-06-08 01:39:53 +02:00
daraelmin
f872585ea2
Fix #21150 - Regression Can't insert manual lines 
Fix #21150 - Regression Can not insert manual lines for automatically created transactions to the general ledger, this was possible before.
 2022-06-08 01:02:02 +02:00
Faustin
b6724f6061 FIX #20696 2022-06-07 16:43:49 +02:00
Sylvain Legrand
4e118ba1ae Fix deposit management on accountancy supplier index 2022-06-01 22:54:05 +02:00
Laurent Destailleur
49ded63cbc
Merge pull request #21052 from defrance/patch-197 
php V8 warning
 2022-06-01 21:57:21 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
BENKE Charlene
b8de54aac0
php V8 warning 2022-05-30 08:08:28 +02:00
BENKE Charlene
d14faf86a0
php V8 warning fix 2022-05-27 16:14:36 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
Alexandre SPANGARO
e437a53657 Typo 2022-05-23 21:40:47 +02:00
Laurent Destailleur
c53b42ef29
Merge pull request #20910 from priojk/develop 
NEW #20905 add hooks for accountancy export
 2022-05-22 01:28:56 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-20 23:28:01 +02:00
stickler-ci
18e9a332b4 Fixing style errors. 2022-05-20 12:58:46 +00:00
priojk
03d60ec05e NEW #20905 add hooks for accountancy export 2022-05-20 14:54:26 +02:00
daraelmin
3d734e8d34
FIX regression PR #20713 
Please do not revert with PR #20900
 2022-05-20 09:22:16 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
6b88655213 Fix num_rows 2022-05-18 23:40:42 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +02:00
Laurent Destailleur
02bad082d6
Merge pull request #19383 from atm-gauthier/NEW/accountancy_massaction_preselect_account_customer_and_supplier_list 
NEW : accountancy massaction preselect account (customer and supplier list)
 2022-05-10 14:45:35 +02:00
Laurent Destailleur
e3ff7b43ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-10 11:39:55 +02:00
Laurent Destailleur
1b82340e1b
Merge pull request #20785 from aspangaro/16a29-Fixcustomerdeposit 
FIX Accountancy - Add an option to disable use of sub-account on deposit line
 2022-05-10 11:37:24 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
Laurent Destailleur
0cac14c82f Fix trans 2022-05-09 16:51:31 +02:00
Laurent Destailleur
b3bfe22f58 FIX Error management 2022-05-09 16:45:57 +02:00
Laurent Destailleur
43e1486dbb FIX No empty line inserted into accounting_bookkeeping 2022-05-09 16:42:08 +02:00
Laurent Destailleur
000c6f69bd
Merge pull request #20801 from aspangaro/16a31 
Look & feel v16
 2022-05-08 18:56:23 +02:00
Laurent Destailleur
bbba8abebc
Merge pull request #20805 from aspangaro/16a32 
FIX Accountancy - Product Account - SQL Error with only_full_group_by option enabled
 2022-05-08 18:55:46 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Alexandre SPANGARO
710f189b98 FIX SQL Error with full_group_by option enabled 2022-05-08 06:34:47 +02:00
Alexandre SPANGARO
39716dce28 Look & feel v16 2022-05-07 06:43:23 +02:00
stickler-ci
fb97f7db29 Fixing style errors. 2022-05-05 14:59:49 +00:00
Alexandre SPANGARO
7bb5ac4095 FIX Accountancy - Add an option to disable use of sub-account on deposit line 2022-05-05 16:48:01 +02:00
Laurent Destailleur
1957ebcc35 Fix restore warning 2022-05-04 02:13:29 +02:00
Laurent Destailleur
cf38d69733
Merge pull request #20729 from aspangaro/16a26-Accountancy_reconcile 
NEW Accountancy - Add reconcile functionality
 2022-05-01 12:28:51 +02:00
Laurent Destailleur
801f0e62f7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-29 17:37:01 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
 2022-04-29 17:32:28 +02:00
Laurent Destailleur
f06af016cd
Merge pull request #20720 from aspangaro/16a24 
FIX Accountancy - Export format FEC - Prevent tabbing in label with the formats for which it is the separator
 2022-04-29 16:50:51 +02:00
Alexandre SPANGARO
7752c5f122 Comment function 2022-04-28 17:24:10 +02:00
Alexandre SPANGARO
f2d81f97b9 Comment function 2022-04-28 17:10:30 +02:00
stickler-ci
96e247bf89 Fixing style errors. 2022-04-28 13:55:54 +00:00
Alexandre SPANGARO
5cc1aba0f5 Merge branch '16a26-Accountancy_reconcile' of https://github.com/aspangaro/dolibarr into 16a26-Accountancy_reconcile 2022-04-28 15:50:16 +02:00
Alexandre SPANGARO
5379db7c6b Fix stickler-ci 2022-04-28 15:49:08 +02:00
stickler-ci
68864840b6 Fixing style errors. 2022-04-28 13:25:50 +00:00
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02:00
Alexandre SPANGARO
5dce613118 NEW Accountancy - Product admin - Add product categories 2022-04-28 05:34:02 +02:00
Alexandre SPANGARO
3f832c1c5d FIX Accountancy - Export format FEC - Prevent tab in label with the formats for which it is the separator 2022-04-27 04:46:09 +02:00
daraelmin
5387a8e953
FiX miss spelling 2022-04-26 19:07:31 +02:00
stickler-ci
6a1d4c2255 Fixing style errors. 2022-04-25 20:36:34 +00:00
daraelmin
694bcda3bb Fix #20712 - No more empty wrong line added in bookkeeping confirme_create mode 2022-04-25 22:26:25 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
9a040e0521
Merge branch 'develop' into NEW/accountancy_massaction_preselect_account_customer_and_supplier_list 2022-04-07 18:36:34 +02:00
Laurent Destailleur
d0ed15ce5c Typo 2022-04-03 17:12:54 +02:00
Laurent Destailleur
e559ad2aba Optimize column size 2022-04-02 16:50:36 +02:00
Alexandre SPANGARO
141e795de2 NEW Accountancy - Add ref supplier and label on supplier binding page 2022-04-02 05:30:49 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
a221b17809 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/compta/facture/class/facture.class.php
 2022-03-29 15:50:25 +02:00
Laurent Destailleur
a415711a66 Fix phpcs 2022-03-29 15:47:54 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
 2022-03-29 15:02:29 +02:00
Laurent Destailleur
d1c5c79d22 Merge pull request #20299 from 
Easya-Solutions/13.0_fix-thirdparty-mandatory-fields-on-validate-invoice

FIX check mandatory thirdparty fields for mass action
 2022-03-29 14:53:19 +02:00
Laurent Destailleur
8dd44246b0
Merge pull request #20348 from daraelmin/daraelmin-patch-5 
Fix #20263 Accountancy setup displayed with right
 2022-03-29 14:47:57 +02:00
Alexandre SPANGARO
9db7d29237 Accountancy - Removed old code for reconciled (or lettering...) 2022-03-24 23:14:23 +01:00
Laurent Destailleur
5eb6ddd7b4 Merge 20374 and add some fix. Need to be restested. 2022-03-23 15:32:05 +01:00