Commit Graph

527 Commits

Author SHA1 Message Date
Laurent Destailleur
0a88dc95a5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-07-06 13:59:13 +02:00
Laurent Destailleur
86362599c1 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-07-06 13:55:04 +02:00
Laurent Destailleur
ca39809658 Fix #30256 2024-07-06 13:53:54 +02:00
Laurent Destailleur
d1a80920ff Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-20 19:53:50 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/product/stock/stockatdate.php
2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
Alexandre SPANGARO
cc452f2136 FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound (#26545)
* FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound

* Update expensereportsjournal.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-12 22:16:47 +01:00
Laurent Destailleur
421f7ecff4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-21 11:36:42 +02:00
Alexandre SPANGARO
a9f86d94ea FIX - Remove warning on lettering - Impossible to write in ledger v16 v17 v18 2023-05-20 08:11:39 +02:00
Laurent Destailleur
e247337fc2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-24 19:47:24 +01:00
Laurent Destailleur
6b07447b81 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-24 19:42:06 +01:00
Laurent Destailleur
459d012c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-24 19:40:36 +01:00
Thibault Fiacre
45b7a911d8 FIX invoices order on sells journal
On sells journal, invoices are ordered by date (datef) but when several invoices have the same date, sometimes they are not ordered by reference.
2023-03-22 08:14:58 +01:00
Laurent Destailleur
c7431b83ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-10 13:14:13 +01:00
Laurent Destailleur
5b65d7d3fb Complete #24049. Reduce bad effect of option INVOICE_USE_SITUATION 2023-03-03 12:08:12 +01:00
Laurent Destailleur
767ad3e366 Debug v17 2023-03-02 20:49:38 +01:00
Laurent Destailleur
71fd9f39d3 Add comments to help understand what happen 2023-03-02 17:41:59 +01:00
Marc de Lima Lucio
1c57b75510 FIX: accountancy lettering: better error management 2023-03-02 15:04:15 +01:00
Laurent Destailleur
9322cb28ed Typo 2023-02-20 13:59:46 +01:00
Laurent Destailleur
3e273d4004 Debug v17 2023-01-14 15:47:22 +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
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
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
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
Alexandre SPANGARO
570a75b3d6 Fix separator 2022-11-07 18:50:21 +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
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