Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-30 13:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,518 Commits 37 Branches 191 Tags
0fd2e91ccc127f2a0791e2e9eb57504acba0d025
Commit Graph

256 Commits

Author SHA1 Message Date
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02: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
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +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
BENKE Charlene
c4c43fc9f9 Update list.php 2022-01-13 12:22:16 +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
Alexandre SPANGARO
b28b12f93a FIX Accountancy - SQL error on subledger account search in journal 2021-11-22 16:19:01 +01: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
3e485dcb41 FIX Accountancy - Option of export popup are inverted 2021-09-24 06:38:43 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
5256d6e046 css 2021-07-31 17:34:41 +02:00
Laurent Destailleur
9734fced56 Merge pull request #18221 from aspangaro/14p8 
FIX: Accountancy - Search date on journal
 2021-07-28 19:48:38 +02:00
Alexandre SPANGARO
183d413b45 FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger 2021-07-26 04:42:35 +02:00
Alexandre SPANGARO
84e5773de8 FIX: Accountancy - Search date on journal 2021-07-25 22:37:20 +02:00
Alexandre SPANGARO
cf723d5120 Look a feel v14 CSS Amount 2021-06-13 06:37:44 +02:00
Alexandre SPANGARO
11959ec1ab Fix some date problems 2021-06-13 06:07:01 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Alexandre SPANGARO
7444ff5412 Update notified 2021-06-12 14:18:44 +02:00
Laurent Destailleur
e9ed985e18 Fix filter 2021-05-03 12:47:40 +02:00
Laurent Destailleur
39e27b6f38 Minor perf enhancement 2021-05-03 12:32:31 +02:00
Alexandre SPANGARO
305b338a11 Update notified 2021-04-19 06:03:03 +02:00
Alexandre SPANGARO
451164ba64 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-10 21:44:23 +02:00
Laurent Destailleur
2e3af575be Look and feel v14 2021-03-31 18:12:26 +02:00
Laurent Destailleur
27bc05a039 Debug report accountancy 2021-03-31 17:59:42 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
 2021-03-29 21:47:31 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
Alexandre SPANGARO
49faedae6f Work on date_validation 2021-03-24 11:56:23 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Frédéric FRANCE
7b8d1abfcf fix php8 warnings 2021-03-16 18:04:51 +01:00
Frédéric FRANCE
337689d5d2 code syntax 2021-02-22 21:36:42 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
7fd2ac6618 Fix link to show line in pending account 2021-02-22 16:20:13 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Alexandre SPANGARO
77a43c51f9 FIX: Accountancy - Search_not_reconciled 2021-01-22 15:10:23 +01:00
Laurent Destailleur
ba37396af2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 14:36:32 +01:00
Laurent Destailleur
82cedd9fd2 Fix filter 2021-01-15 14:36:02 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Laurent Destailleur
77a094007f Fix parm to url to switch between screen 
Fix error message
Make position of columns more friendly
 2021-01-14 10:34:32 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Laurent Destailleur
88fdf0491f Merge pull request #15943 from aspangaro/13b6 
FIX: Hidden accountancy export button without any right
 2021-01-11 16:07:55 +01:00
stickler-ci
7339217cf1 Fixing style errors. 2021-01-11 08:51:52 +00:00
Alexandre SPANGARO
c40976e4f9 FIX: Hidden accountancy export button without any right 2021-01-11 09:47:59 +01:00