Commit Graph

3208 Commits

Author SHA1 Message Date
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Laurent Destailleur
91eafaea98 Merge pull request #20109 from aspangaro/14p33
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
2022-02-18 20:21:43 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
Alexandre SPANGARO
3f109aa911 FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity 2022-02-18 09:24:12 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-17 20:50:03 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
Alexandre SPANGARO
0f51fadf38 Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +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
Frédéric FRANCE
935482ee22 uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +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
Alexandre SPANGARO
1d974f67f0 Fix stickler-ci 2022-02-14 16:17:19 +01:00
Laurent Destailleur
ff17fe5ae7 Fix reponsive 2022-02-14 12:28:19 +01:00
Laurent Destailleur
dce996a53f Reponsive 2022-02-14 12:28:11 +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
stickler-ci
dd5be840aa Fixing style errors. 2022-02-14 03:31:30 +00:00
Alexandre SPANGARO
d5e521c87b Accountancy 2022-02-14 04:27:52 +01:00
Alexandre SPANGARO
9349e2df7c FIX Accountancy - Order by accounting account on summary page 2022-02-13 21:11:45 +01:00
Laurent Destailleur
a1f88c1186 Fix reponsive 2022-02-13 18:03:29 +01:00
Laurent Destailleur
a52f1d1094 Reponsive 2022-02-13 17:33:45 +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
Laurent Destailleur
abc5a93d99 Merge pull request #19827 from defrance/patch-175
NEW : use addMoreActionsButtonsList hook in list
2022-01-26 14:19:14 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
fccddd7805 Fix property missing 2022-01-13 20:11:18 +01:00
Laurent Destailleur
965703e04a Fix missing var 2022-01-13 20:09:40 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
b6dc7a3f19 Doc 2022-01-13 19:09:34 +01:00
BENKE Charlene
90829bd255 Update listbysubaccount.php 2022-01-13 12:23:14 +01:00
BENKE Charlene
05603730ca Update listbyaccount.php 2022-01-13 12:22:45 +01:00
BENKE Charlene
c4c43fc9f9 Update list.php 2022-01-13 12:22:16 +01:00
BENKE Charlene
cc6dd99bf6 NEW : addMoreActionsButtonsList hook for button in list 2022-01-13 12:20:54 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Alexandre SPANGARO
37033b04be FIX Accountancy - Separator problem with FEC/FEC2 export format 2021-12-20 07:04:12 +01:00
Laurent Destailleur
477e9ddd4c Try to complete fix 2021-12-19 01:04:24 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
2021-12-19 00:36:22 +01:00
Laurent Destailleur
6643a05216 php 8 2021-12-19 00:19:17 +01:00
Laurent Destailleur
d46ef9c42a css 2021-12-18 23:51:14 +01:00
Laurent Destailleur
8925a8041a Fix trforbreak 2021-12-18 23:16:46 +01:00
Laurent Destailleur
80a7b83956 Debug status of accounting account 2021-12-18 23:02:31 +01:00
Laurent Destailleur
5fed6de5b8 Fix feature to close record in accounting 2021-12-18 22:53:30 +01:00
Laurent Destailleur
0fe1634f29 Fix missing print 2021-12-18 22:36:32 +01:00
Laurent Destailleur
2335cf5fb4 css 2021-12-18 22:19:21 +01:00
Laurent Destailleur
fa5d96d562 Add more info to help debug 2021-12-18 16:48:08 +01:00