Commit Graph

495 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
b47f5cd19d Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-06 17:30:38 +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
Alexandre SPANGARO
7b8ed8dfc5 Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-01 08:06:52 +02:00
Regis Houssin
36c54a140f FIX compatibility with Mysql <= 5.7 2022-09-28 22:32:55 +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
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
373449900f FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) 2022-09-15 05:21:22 +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
8d33953142 add comment 2022-09-07 20:08:59 +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
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
Alexandre SPANGARO
bb786d5ab9 NEW Accountancy - Manage supplier deposit with specific account 2022-08-21 08:06:04 +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
Laurent Destailleur
e9892fdc32 css 2022-07-24 15:47:55 +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
Alexandre SPANGARO
e9ae888fc7 FIX Accountancy - Label of VAT account is empty 2022-07-22 16:01:39 +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
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
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
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +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
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
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +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
Alexandre SPANGARO
0856a49ef0 Fix 2022-03-17 14:44:00 +01:00
Alexandre SPANGARO
8702918806 Use getDolGlobalIntString() 2022-03-16 16:09:09 +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
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
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
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
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
Alexandre SPANGARO
d5e521c87b Accountancy 2022-02-14 04:27:52 +01:00