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
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
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +01:00
Alexandre SPANGARO
2ef8bd42df Merge remote-tracking branch 'upstream/develop' into 16a3 2022-03-17 14:44:38 +01:00
Alexandre SPANGARO
0856a49ef0 Fix 2022-03-17 14:44:00 +01:00
lvessiller
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
Laurent Destailleur
6c210f72dc Fix missing var declaration and constructor 2022-03-16 20:31:40 +01:00
Alexandre SPANGARO
8702918806 Use getDolGlobalIntString() 2022-03-16 16:09:09 +01:00
lvessiller
cbbfe68482 FIX stickler-ci 2022-03-16 11:06:14 +01:00
lvessiller
4ad6cc6a65 FIX stickler-ci 2022-03-16 11:00:14 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +01:00
stickler-ci
587b2076d8 Fixing style errors. 2022-03-15 08:11:44 +00:00
Alexandre SPANGARO
5fafa8b642 NEW Accountancy - Add subledger account when we generate a transaction with a deposit invoice 2022-03-15 06:29:26 +01:00
stickler-ci
19be5f662d Fixing style errors. 2022-03-14 08:25:15 +00:00
daraelmin
3eebbc0b14
Fix #20263 Accountancy setup displayed with right 
Fix #20263 Accountancy setup is displayed only for user with rights->accounting->chartofaccount
 2022-03-14 09:24:26 +01:00
Alexandre SPANGARO
87b187bded FIX #20279 Accountancy - PostGreSQL - Error on mass update lines already binded 2022-03-08 03:43:40 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations. 
Fix reponsive
 2022-03-03 09:41:15 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
c452428d12 Fix label of menu 2022-03-02 22:20:05 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
Laurent Destailleur
2ed7a4431f Doxygen 2022-02-28 22:13:28 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
a89fd3c818
Merge pull request #20198 from gdsoftdev/develop 
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
 2022-02-28 21:56:01 +01:00
Laurent Destailleur
adb4af7099 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:39:34 +01:00
stickler-ci
722b1de2b7 Fixing style errors. 2022-02-25 15:10:10 +00:00
Jé GDSOFT
073431543d accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 16:07:44 +01:00
Jé GDSOFT
1040555baf accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 11:26:56 +01:00
Alexandre SPANGARO
6b4c4f19ab NEW Accountancy - Add date from/to on expense report binding & uniformize 2022-02-25 04:55:55 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
c7c0c75429 Clean code 2022-02-22 22:27:09 +01:00
Laurent Destailleur
d6786459b4 FIX #yogosha9054 2022-02-22 22:03:34 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Laurent Destailleur
91eafaea98
Merge pull request #20109 from aspangaro/14p33 
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
 2022-02-18 20:21:43 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
Alexandre SPANGARO
3f109aa911 FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity 2022-02-18 09:24:12 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Alexandre SPANGARO
9a0a222b63 Fix stickler-ci 2022-02-16 14:21:45 +01:00
Alexandre SPANGARO
11d1d9a0af Fix stickler-ci 2022-02-16 05:17:38 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Laurent Destailleur
54bf8ed1ed Fix link 2022-02-14 22:53:24 +01:00
Laurent Destailleur
b6879d7953 css 2022-02-14 22:38:45 +01:00
Alexandre SPANGARO
1d974f67f0 Fix stickler-ci 2022-02-14 16:17:19 +01:00
Laurent Destailleur
ff17fe5ae7 Fix reponsive 2022-02-14 12:28:19 +01:00
Laurent Destailleur
dce996a53f Reponsive 2022-02-14 12:28:11 +01:00
Alexandre SPANGARO
0d1ee4e19f Fix stickler-ci 2022-02-14 11:51:05 +01:00
Alexandre SPANGARO
a17ac09fd0 Resolve stickler-ci 2022-02-14 11:03:44 +01:00
stickler-ci
dd5be840aa Fixing style errors. 2022-02-14 03:31:30 +00:00
Alexandre SPANGARO
d5e521c87b Accountancy 2022-02-14 04:27:52 +01:00
Alexandre SPANGARO
9349e2df7c FIX Accountancy - Order by accounting account on summary page 2022-02-13 21:11:45 +01:00
Laurent Destailleur
a1f88c1186 Fix reponsive 2022-02-13 18:03:29 +01:00
Laurent Destailleur
a52f1d1094 Reponsive 2022-02-13 17:33:45 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
7f04b7dc3d Fix button Cancel 2022-02-07 15:26:03 +01:00
Laurent Destailleur
abc5a93d99
Merge pull request #19827 from defrance/patch-175 
NEW : use addMoreActionsButtonsList hook in list
 2022-01-26 14:19:14 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
fccddd7805 Fix property missing 2022-01-13 20:11:18 +01:00
Laurent Destailleur
965703e04a Fix missing var 2022-01-13 20:09:40 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
b6dc7a3f19 Doc 2022-01-13 19:09:34 +01:00
BENKE Charlene
90829bd255
Update listbysubaccount.php 2022-01-13 12:23:14 +01:00
BENKE Charlene
05603730ca
Update listbyaccount.php 2022-01-13 12:22:45 +01:00
BENKE Charlene
c4c43fc9f9
Update list.php 2022-01-13 12:22:16 +01:00
BENKE Charlene
cc6dd99bf6
NEW : addMoreActionsButtonsList hook for button in list 2022-01-13 12:20:54 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Alexandre SPANGARO
37033b04be FIX Accountancy - Separator problem with FEC/FEC2 export format 2021-12-20 07:04:12 +01:00
Laurent Destailleur
477e9ddd4c Try to complete fix 2021-12-19 01:04:24 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
6643a05216 php 8 2021-12-19 00:19:17 +01:00
Laurent Destailleur
d46ef9c42a css 2021-12-18 23:51:14 +01:00
Laurent Destailleur
8925a8041a Fix trforbreak 2021-12-18 23:16:46 +01:00
Laurent Destailleur
80a7b83956 Debug status of accounting account 2021-12-18 23:02:31 +01:00
Laurent Destailleur
5fed6de5b8 Fix feature to close record in accounting 2021-12-18 22:53:30 +01:00
Laurent Destailleur
0fe1634f29 Fix missing print 2021-12-18 22:36:32 +01:00
Laurent Destailleur
2335cf5fb4 css 2021-12-18 22:19:21 +01:00
Laurent Destailleur
fa5d96d562 Add more info to help debug 2021-12-18 16:48:08 +01:00
Laurent Destailleur
fde9a6667f Fix colspan 2021-12-18 15:46:08 +01:00
Laurent Destailleur
e17ddee559
Merge pull request #19396 from FHenry/14.0_fix_margin_cal_with_depositinvoice 
fix: #ZENDSI fix margin calc with credit note
 2021-12-16 18:48:27 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +01:00
Laurent Destailleur
582caf0e7a FIX message for automatic binding not clear of what was done or not 2021-12-13 19:04:25 +01:00
Laurent Destailleur
e7b7c3281e Fix page of accountancy transaction 2021-12-13 17:42:10 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Frédéric FRANCE
e562bf5b1c
can modify tooltip by reference 2021-11-22 20:08:21 +01:00
Frédéric FRANCE
c01cc0c212
can modify tooltip by reference 2021-11-22 20:06:51 +01:00
Alexandre SPANGARO
b28b12f93a FIX Accountancy - SQL error on subledger account search in journal 2021-11-22 16:19:01 +01:00
Laurent Destailleur
f484fc2710 NEW On the summary of lines to link, can zoom on month. 2021-11-22 05:21:24 +01:00
Laurent Destailleur
2975d47113 FIX Debug a lot of regression in accountancy transfer 2021-11-22 04:13:16 +01:00
Laurent Destailleur
290a6c3d58 Prepare code to allow to filter autolink on month/year 2021-11-22 03:34:50 +01:00
Laurent Destailleur
a1c1999d7d Fix param on link to automatically bind transaction on product account 2021-11-22 03:22:15 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Florian HENRY
0e8e8a79dc review code 2021-11-18 21:12:43 +01:00
Florian HENRY
e4803dda88 ZENDSI: fix margin calc with credit note 2021-11-16 17:46:12 +01:00
Florian HENRY
8bb7f9c8fb ZENDSI: fix margin calc with credit note 2021-11-16 17:44:18 +01:00
Florian HENRY
7380f5901b ZENDSI: fix margin calc with credit note 2021-11-16 17:41:38 +01:00
Gauthier PC portable 024
dd23057516 NEW : accountancy massaction preselect account (customer and supplier list) 2021-11-15 14:54:09 +01:00
Gauthier PC portable 024
7d1b409e59 NEW : accountancy massaction preselect account (productaccount page) 2021-11-15 14:35:55 +01:00
Laurent Destailleur
5a1f54f47f Fix transfer in accountancy for supplier invoices 2021-11-15 09:57:41 +01:00
Laurent Destailleur
5dd2bedffa Fix fatal error 2021-11-15 09:42:27 +01:00
Laurent Destailleur
67d69e5cd6 Fix autocheck if vat rate seems wrong 2021-11-15 09:14:58 +01:00
Laurent Destailleur
5b5f41606a NEW PDF generation support format PDF/A-1b and PDF/A-3b 2021-11-15 09:02:01 +01:00
Laurent Destailleur
2857619316 Clean code 2021-11-14 19:33:54 +01:00
Laurent Destailleur
e29ef08ee7 Fix regression in default set of accounting accounts 2021-11-14 19:10:06 +01:00
Laurent Destailleur
8954f7415b Fix warning on vat possible anomaly. 2021-11-14 18:40:25 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
5085db36a7 Clean code 2021-11-07 18:54:59 +01:00
Laurent Destailleur
9fd5727985 Try to fix some regressions 2021-11-07 18:47:27 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
Laurent Destailleur
b4895c4dd2
Merge pull request #18975 from aspangaro/14p23 
FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction
 2021-10-31 18:13:54 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Alexandre SPANGARO
da52742421 FIX Accountancy - Product admin - SQL error when we affect accounting account with product_perentity activated 2021-10-29 05:47:29 +02:00
Alexandre SPANGARO
a129e91198 Merge branch '14.0' into 14p23 2021-10-26 06:23:31 +02:00
Laurent Destailleur
e12d9ee979
Merge pull request #19156 from frederic34/defaultvaluegetglobal 
can specify default in getDolGlobalString and getDolGlobalInt
 2021-10-23 22:42:40 +02:00
Laurent Destailleur
dc1e57e267
Merge pull request #19155 from frederic34/patch-1 
fix warnings
 2021-10-23 22:41:05 +02:00
Frédéric FRANCE
cb66b71017
Update journals_list.php 2021-10-23 21:39:07 +02:00
Frédéric FRANCE
1639eae92e
fix warning remove unused 2021-10-23 21:37:17 +02:00
Frédéric FRANCE
29371487a0
fix warning 2021-10-23 21:14:32 +02:00
Frédéric FRANCE
635cb34606
fix warning 2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16
can specify default in getDolGlobalString and getDolGlobalInt 2021-10-23 21:06:37 +02:00
Frédéric FRANCE
cdba9909be
fix warnings 2021-10-23 20:53:46 +02:00
Laurent Destailleur
757d841f15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 17:20:00 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Philippe GRAND
ce75806728 fix scrutinizer : The property datef does not exist on Facture 2021-10-23 11:46:54 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes 
fix warnings
 2021-10-23 11:38:03 +02:00
Laurent Destailleur
df1d8b02c7
Merge pull request #19129 from frederic34/patch-4 
fix warnings
 2021-10-23 11:37:52 +02:00
Frédéric FRANCE
21aaed4a86
Update closure.php 2021-10-23 07:40:36 +02:00
Frédéric FRANCE
93e223bf84
fix warnings 2021-10-23 07:38:10 +02:00
Frédéric FRANCE
57bac4f5db
fix warnings 2021-10-23 07:29:12 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Laurent Destailleur
81f2a21954
Merge pull request #18942 from aspangaro/15a25 
NEW Accountancy - rewrite bind accountancy code finding on purchase invoice
 2021-10-22 22:56:24 +02:00
Laurent Destailleur
ea28256635
Merge pull request #19120 from frederic34/patch-5 
fix warning
 2021-10-22 22:47:57 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Frédéric FRANCE
e82a07085f
Update subaccount.php 2021-10-22 22:08:38 +02:00
Frédéric FRANCE
e411e23082
Update card.php 2021-10-22 22:08:13 +02:00
Frédéric FRANCE
6e2f438830
Update accountmodel.php 2021-10-22 22:07:47 +02:00
Frédéric FRANCE
9ca8dfcef9
fix warning 2021-10-22 22:05:04 +02:00
Alexandre SPANGARO
40a23e4aa4 Update work, thanks Florian 2021-10-22 17:12:44 +02:00
Alexandre SPANGARO
0cbfdb4219 Merge remote-tracking branch 'upstream/develop' into 15a25 2021-10-22 16:49:47 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
0589c9c3ca fix: scrutinizer 2021-10-21 15:55:11 +02:00
Florian HENRY
f783dd56a4 fix: scrutinizer 2021-10-21 15:54:23 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
766463a0b2
Merge pull request #18966 from aspangaro/14p22 
Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems
 2021-10-20 12:51:29 +02:00
Alexandre SPANGARO
2dc997528b Merge branch '14.0' into 14p23 2021-10-20 07:42:01 +02:00
Alexandre SPANGARO
bee6abd6fc Merge branch '14.0' into 14p24 2021-10-20 07:38:54 +02:00
Alexandre SPANGARO
9685695577 FIX Accountancy - PHP8 2021-10-18 10:19:46 +02:00
Alexandre SPANGARO
dce1e56a78 FIX #18912 Accountancy - SQL error when custom group is added without country defined 2021-10-18 05:44:22 +02:00
Alexandre SPANGARO
9e3a00521d FIX also on customer index for automatic binding 2021-10-13 21:36:04 +02:00
Alexandre SPANGARO
5d7587259d FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction 2021-10-13 21:21:16 +02:00
Alexandre SPANGARO
04091169da Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems 2021-10-13 02:48:42 +02:00
Laurent Destailleur
ff15292b49
Merge pull request #18949 from aspangaro/15a26 
NEW Accountancy - Format FEC/FEC2 - Add column NumFacture
 2021-10-12 15:29:10 +02:00
Laurent Destailleur
34f2b2b68d
Merge branch 'develop' into 15a25 2021-10-12 12:50:30 +02:00
Laurent Destailleur
6168e844bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-12 01:43:20 +02:00
Laurent Destailleur
ed3b267d8f Fix css 2021-10-12 01:40:30 +02:00
Alexandre SPANGARO
de98900cb7 NEW Accountancy - Format FEC/FEC2 - Add column NumFacture 2021-10-11 22:00:59 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Alexandre SPANGARO
af8e8077b1 Uniformize 2021-10-11 12:50:16 +02:00
Alexandre SPANGARO
e899d94ed5 NEW Accountancy - rewrite bind accountancy code finding on purchase invoice 2021-10-11 12:50:07 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Laurent Destailleur
831c72411b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-07 11:35:58 +02:00
Laurent Destailleur
d245abe908 Fix rounding 2021-10-07 11:34:21 +02:00
Laurent Destailleur
162d5d8a39 Fix protection of double party accounting when using situation invoices 2021-10-07 10:38:10 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
4c6f2fc4b5
Merge pull request #18874 from OPEN-DSI/v14-fix-product-per-entity-portability-sql 
FIX Product accountancy affectation with product_perentity activated …
 2021-10-02 21:04:11 +02:00
lvessiller
fd7d1374c2 FIX Product accountancy affectation with product_perentity activated (PR #18620) 2021-10-01 16:37:54 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
17c89a478c
Merge pull request #17819 from FHenry/dev_new_splitcalc_suggestd_code_compta 
NEW : rewrite bind accountancy code finding on sales invoice
 2021-09-30 14:13:20 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Florian HENRY
d565f9d3f1 reveiw code 2021-09-28 15:09:47 +02:00
Florian HENRY
f47a319c15 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-09-28 15:01:14 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Alexandre SPANGARO
4e212054a4 Merge branch '14.0' into 14p16 2021-09-25 07:13:03 +02:00
Alexandre SPANGARO
8f5f657e4d FIX Accountancy - Missing specific filename for export on format FEC2, Ciel & repare it 2021-09-25 07:12:33 +02:00
Laurent Destailleur
00120109fb
Merge pull request #18813 from aspangaro/14p21 
FIX Accountancy - Error on ValidDate for FEC/FEC2 export
 2021-09-24 13:07:17 +02:00
Alexandre SPANGARO
a1bd07d1a3 FIX Accountancy - Error on ValidDate for FEC/FEC2 export 2021-09-24 12:04:25 +02:00
Alexandre SPANGARO
3e485dcb41 FIX Accountancy - Option of export popup are inverted 2021-09-24 06:38:43 +02:00
Alexandre SPANGARO
15313b8d37 FIX Accountancy - Missing specific filename for export on format FEC2 2021-09-24 06:03:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
dcd3f85e79 Fix sql error 2021-09-21 17:32:08 +02:00
Laurent Destailleur
a7ccbb4d9a css 2021-09-21 15:40:42 +02:00
Laurent Destailleur
841c4da0f8 Fix css 2021-09-21 15:39:05 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
dff038fddd
Merge pull request #18705 from aspangaro/14p19 
FIX Accountancy - Format Quadra export - Missing line type C to create automaticly a subledger account with label
 2021-09-17 11:56:38 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00