Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

251 Commits

Author SHA1 Message Date
Frédéric FRANCE
14b328bc89 use user hasRight 2023-06-09 13:39:41 +02:00
Roger Dueck
07bf141048 Fix undefined property errors and use getDolGlobalString() 2023-06-06 10:09:02 -06:00
Laurent Destailleur
fe9521b6b2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-21 17:34:34 +02: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
ab92bd5860 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-24 19:52:32 +01: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
ae8b213d04 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-10 13:31:02 +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
2b4f4e9e4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-04 15:25:58 +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
040958f73d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-02 21:28:32 +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
ab870d99c1 Merge pull request #21196 from aspangaro/17p3 
NEW Accountancy - Manage customer retained warranty FPC21+
 2023-01-08 14:53:43 +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
e5176a78f5 Need 2 different translations for Debit-Credit in some pages for Italia 2022-11-30 18:56:16 +01:00
Alexandre SPANGARO
7c77c321c3 Merge remote-tracking branch 'upstream/develop' into 17p3 2022-11-10 02:23:38 +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
Alexandre SPANGARO
7b8ed8dfc5 Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-01 08:06:52 +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
373449900f FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) 2022-09-15 05:21:22 +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
Philippe GRAND
f94e2b3fe9 FIX php8 compatibility 2022-08-16 17:20:38 +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
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
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
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
b6879d7953 css 2022-02-14 22:38:45 +01: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
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +02:00
Alexandre SPANGARO
a0378549b8 FIX Accountancy - Some problems of length with general & subledger account 2021-08-23 15:19:27 +02:00