Commit Graph

93723 Commits

Author SHA1 Message Date
Laurent Destailleur
3285dd3199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	ChangeLog
	htdocs/compta/bank/various_payment/list.php
2021-02-19 14:11:08 +01:00
Laurent Destailleur
45fda63a20 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-19 14:08:51 +01:00
Laurent Destailleur
d7c3cc4d18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/bank/various_payment/list.php
2021-02-19 14:08:36 +01:00
Laurent Destailleur
dc3377f0f0
Merge pull request #16348 from ptibogxiv/patch-416
Fix multientity in cash fence report
2021-02-19 13:51:44 +01:00
Laurent Destailleur
556651a3ae
Update report.php 2021-02-19 13:51:15 +01:00
Laurent Destailleur
efb9ee458a
Merge pull request #16349 from ivanmestre/v12-fix-bank-account-filter-reset-payment-various
V12 FIX #16241 Bank Account filter resets on Miscellaneous Payments
2021-02-19 12:39:33 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
Iván Mestre
57e9277376 Fixed Bank Account filter resets on payment various
Changed GET search bank account GET parameter from search_amount to search_account
2021-02-18 16:23:18 -03:00
ptibogxiv
cafc6a3da2
Fix multientity in cash fence report
it make no sense to merge cash fence in différent entity with same terminal number.
2021-02-18 20:04:09 +01:00
Laurent Destailleur
27818b68ae Fix tz pb in week view 2021-02-18 17:07:39 +01:00
Laurent Destailleur
9d12aeee49 Fix timezone problem with drag and drop 2021-02-18 15:41:52 +01:00
Laurent Destailleur
72ad47c75f Fix link to create a new event in calendar 2021-02-18 15:20:05 +01:00
Laurent Destailleur
7d48dd8103 Fix cache 2021-02-17 15:00:32 +01:00
Laurent Destailleur
8b930cbe5e FIX Missing cache declaration into manifest.json.php
Move test files into test.
2021-02-17 14:22:01 +01:00
Laurent Destailleur
96a213ced7 Fix escaping html 2021-02-17 11:54:34 +01:00
Laurent Destailleur
a41be55251 FIx #16306 2021-02-16 20:11:51 +01:00
Laurent Destailleur
20bfc7cddc
Merge pull request #16320 from FHenry/13.0
FIX: THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION really change select company type
2021-02-16 19:52:41 +01:00
Laurent Destailleur
f11c4ccc48
Merge pull request #16319 from ptibogxiv/patch-415
Fix set date delivery on create order form
2021-02-16 19:44:54 +01:00
Laurent Destailleur
0d841ecb1e Reduce field size 2021-02-16 19:36:14 +01:00
Laurent Destailleur
c49a145aec Standardize code 2021-02-16 19:06:24 +01:00
Laurent Destailleur
12aa8fe223 Fix css 2021-02-16 19:01:00 +01:00
Florian HENRY
0f00194d97 revert commit 2021-02-16 18:59:23 +01:00
Florian HENRY
f3360647c9 Merge branch '13.0' of github.com:FHenry/dolibarr into 13.0 2021-02-16 18:57:51 +01:00
Florian HENRY
81ff7843f4 fix: THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION really change select entrprise type 2021-02-16 18:57:25 +01:00
ptibogxiv
39b29a7d68
Fix set date delivery on create order form 2021-02-16 17:40:00 +01:00
Laurent Destailleur
0c73cdb129 Prepare 12.0.5 2021-02-16 13:42:26 +01:00
Laurent Destailleur
a81e4d4daa Fix bad picto 2021-02-16 13:21:18 +01:00
Laurent Destailleur
6a46078449 Fix bad url 2021-02-16 12:59:46 +01:00
Laurent Destailleur
0506bb5e62 Trans 2021-02-16 10:43:29 +01:00
Laurent Destailleur
54640199af Fix deletion if permission on dir is not write. 2021-02-15 23:43:56 +01:00
Laurent Destailleur
dabf9d796a FIX Rename title of template invoice 2021-02-15 22:16:01 +01:00
Laurent Destailleur
00642ffb48 Fix label of invoice 2021-02-15 22:04:35 +01:00
Laurent Destailleur
7bbb603859 Fix default template for contract can be empty 2021-02-15 21:46:07 +01:00
Laurent Destailleur
f0e234c874 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/bank/various_payment/list.php
2021-02-15 16:45:17 +01:00
Laurent Destailleur
1d6893e928 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-15 16:43:46 +01:00
Laurent Destailleur
6132843586 FIX Filter on date of next generation on template invoices 2021-02-15 16:43:24 +01:00
Laurent Destailleur
1b69456216 Complete response 2021-02-15 13:00:21 +01:00
Laurent Destailleur
49f8ff5708 FIX #16286 2021-02-15 12:18:09 +01:00
Laurent Destailleur
6e21839169 Fix migration 2021-02-15 11:50:59 +01:00
Laurent Destailleur
b2826025f6 Fix missing event type 2021-02-15 11:48:48 +01:00
Laurent Destailleur
5bead8577c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-14 22:44:17 +01:00
Laurent Destailleur
f4c23654f8 FIX #16275 #15604 2021-02-14 22:44:04 +01:00
Laurent Destailleur
2669de8324
Merge pull request #16272 from AlexisLaurier/13.0
Add missing comma in contract list.php
2021-02-14 21:59:07 +01:00
Laurent Destailleur
e0a7ba6bdf
Merge pull request #16276 from frederic34/patch-3
FIX inverted test
2021-02-14 21:58:10 +01:00
Frédéric FRANCE
811c02b970
fix inverted test 2021-02-12 15:45:49 +01:00
LAURIER Alexis
4b9f71d20e
Add missing comma in contract list.php 2021-02-12 09:00:29 +01:00
Laurent Destailleur
f2f9085fb5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-11 23:05:17 +01:00
Laurent Destailleur
5392e11370 Add missing ethiopian birr currency 2021-02-11 23:05:01 +01:00
Laurent Destailleur
4a2cd0d509
Merge pull request #16253 from AlexisLaurier/13.0
contract - uses of multidir_output for file path
2021-02-11 19:00:20 +01:00
Laurent Destailleur
a848069178
Merge pull request #16258 from ivanmestre/fix-data-filter-reset-payment-various
Fix #16241 Date filter resets on Miscellaneous Payments
2021-02-11 18:59:32 +01:00