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

345 Commits

Author SHA1 Message Date
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
0cac14c82f Fix trans 2022-05-09 16:51:31 +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
Laurent Destailleur
6813bfb1e8 Trans 2022-05-04 02:23:24 +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
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02:00
Alexandre SPANGARO
1e96cd636f FIX Accountancy - Missing language key 2022-04-19 22:38:42 +02: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
c452428d12 Fix label of menu 2022-03-02 22:20:05 +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
Laurent Destailleur
a7ef4991fd Fix position of menu 2021-12-26 15:41:09 +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
Frédéric FRANCE
44d81f91e0
adding a translation 
found in htdocs/accountancy/index.php
 2021-11-13 22:13:06 +01:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/class/task.class.php
 2021-09-24 02:33:48 +02:00
Laurent Destailleur
a2a4a74964 Fix trans 2021-09-23 16:18:21 +02:00
Laurent Destailleur
0a28bf4d30 Trans 2021-09-23 11:44:16 +02:00
Alexandre SPANGARO
ed37f9fb7a FIX Accountancy - Some correction on export name 2021-09-16 06:40:43 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +02:00
Laurent Destailleur
bc816f253c Fix tooltip 2021-06-26 02:07:18 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Laurent Destailleur
d7e445efbd Better doc 2021-05-03 12:01:26 +02:00
Laurent Destailleur
3ae303758b Fix trans 2021-04-30 16:49:52 +02:00
Alexandre SPANGARO
305b338a11 Update notified 2021-04-19 06:03:03 +02:00
Alexandre SPANGARO
510f387a80 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-18 07:49:48 +02:00
Laurent Destailleur
3439bc4a0f Clean code 2021-04-13 11:30:23 +02:00
Laurent Destailleur
7004747ca3 Add more tooltips on edition of accounting account 
Fix setup of accountancy

Conflicts:
	htdocs/accountancy/admin/account.php
 2021-04-13 09:51:17 +02:00
Laurent Destailleur
243fcb38ba Add more tooltips on edition of accounting account 
Fix setup of accountancy
 2021-04-13 09:46:50 +02:00
Alexandre SPANGARO
451164ba64 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-10 21:44:23 +02:00
Alexandre SPANGARO
9b65529fc7 NEW: Accountancy - Add FEC import 2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
98e482de71 Add text for popup 2021-03-22 06:53:09 +01:00
Laurent Destailleur
83df996bc2 Fix english translation 2021-03-05 09:52:25 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping 
Dev multifilter jounal on bookeping
 2020-12-30 13:19:27 +01:00
Laurent Destailleur
b6e33771be
Update accountancy.lang 2020-12-30 13:19:15 +01:00
Laurent Destailleur
057ed201a7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-12-30 12:08:12 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Laurent Destailleur
1d6e2a01a6
Merge pull request #15762 from aspangaro/13b1 
FIX: Accountancy - Quadra export format - Manage negative amount
 2020-12-16 15:24:14 +01:00
Alexandre SPANGARO
ca40d5e52a NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software 2020-12-16 05:16:08 +01:00
Alexandre SPANGARO
ca6b8176e9 Merge remote-tracking branch 'upstream/develop' into 13b1 2020-12-16 04:32:26 +01:00
Laurent Destailleur
cee63335a2 FIX #15754 Mor complete PR 2020-12-15 13:38:21 +01:00
Alexandre SPANGARO
5ec7b01fb4 FIX: Link to subaccount ledger 2020-12-15 09:34:46 +01:00
Alexandre SPANGARO
31e5709e0b Revert "FIX: Link to subaccount ledger" 
This reverts commit 64fa2120b2.
 2020-12-15 09:32:54 +01:00