Commit Graph

93687 Commits

Author SHA1 Message Date
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
Laurent Destailleur
e5d0474c7b
Merge pull request #16259 from ivanmestre/v13-fix-dates-filter-reset-payment-various
V13 Fix #16241 Date filter resets on Miscellaneous Payments
2021-02-11 18:38:51 +01:00
Laurent Destailleur
73cd5e144b
Merge pull request #16263 from aspangaro/12p11
WIP FIX: Accountancy - Fix some problems on CEGID export
2021-02-11 18:33:40 +01:00
Laurent Destailleur
6dfc6c7edf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/filefunc.inc.php
2021-02-11 18:33:03 +01:00
Laurent Destailleur
c306e8ebe9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-11 18:23:47 +01:00
Laurent Destailleur
e1334f34b6 Complete repair to clean not correctly available extrafields on proposal 2021-02-11 18:08:01 +01:00
Laurent Destailleur
2615d63024 Complete repair to clean not correctly available extrafields on proposal 2021-02-11 18:02:21 +01:00
Laurent Destailleur
1b11d9d0e9 FIX payment term label on PDF 2021-02-11 17:48:53 +01:00
Laurent Destailleur
09629d32d7 Fix missing properties in fetch 2021-02-11 14:53:29 +01:00
Alexandre SPANGARO
83f9451b43 FIX: Accountancy - Fix some problems on CEGID export 2021-02-11 13:17:20 +01:00
Iván Mestre
a2051fc01e V13 Fix #16241 Date filter resets on Miscellaneous Payments
Changed $search_datep_start, $search_datep_end, $search_datev_start and $search_datev_end variables to get values from search_datep_start, search_datep_end, search_datev_start and search_datev_end GET parameters if their value is empty after checking POST parameters
2021-02-10 15:20:10 -03:00
Iván Mestre
a249f4f35a Fix #16241 Date filter resets on Miscellaneous Payments
Changed $search_date_start and $search_date_end variables to get values from search_date_start and search_date_end GET parameters if no their value is empty after checking POST parameters
2021-02-10 15:03:17 -03:00
Laurent Destailleur
90d1b2d349 Prepare 12.0.5 2021-02-10 18:05:36 +01:00
Laurent Destailleur
8b125d8076 Fix MVC. Actions must be before output. 2021-02-10 16:44:20 +01:00
Laurent Destailleur
0849ce288c Fix phpcs 2021-02-10 14:04:06 +01:00
Alexis LAURIER
fbeac7c374 contract list.php - add group by for entity 2021-02-10 14:01:52 +01:00
Laurent Destailleur
c9b296ed57 Remove bad use 2021-02-10 13:51:18 +01:00
Alexis LAURIER
5b2779a5f9 contract - use multidir_output 2021-02-10 13:27:42 +01:00
Alexis LAURIER
05b1171e90 Merge branch '13.0' of https://github.com/AlexisLaurier/dolibarr into 13.0 2021-02-10 13:19:47 +01:00
Alexis LAURIER
468f40743d contract - use multidir_output 2021-02-10 13:18:55 +01:00
LAURIER Alexis
cb4295b702
dol_check_secure_access_document contrat multidir_
Use multidir_output for contracts document check to manage entity on each contract
2021-02-10 13:02:13 +01:00
LAURIER Alexis
92c374624e
contrat card.php - showdocuments add parameters
Add missing parameters to showdocuments to manage properly contract entity
2021-02-10 12:58:40 +01:00
LAURIER Alexis
ca5eed691d
manage entity folder in contrat/document.php 2021-02-10 12:45:45 +01:00
LAURIER Alexis
e2ac46f025
manage documents folder as contrat - document.php 2021-02-10 12:44:36 +01:00
LAURIER Alexis
351d4a609f
Merge pull request #10 from AlexisLaurier/AlexisLaurier-contract-multicompany
contract card.php - manage multicompany files
2021-02-10 12:41:10 +01:00
LAURIER Alexis
8e8db38797
contract card.php - manage multicompany files
Use of multidir_output[$object->entity] instead of dir_output to manage shared entities
2021-02-10 12:39:14 +01:00
Laurent Destailleur
4f2e7c51fc Fix #16129 autodetect language on public pages 2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6 FIX #16129 2021-02-10 03:12:19 +01:00
Laurent Destailleur
4c3a96da08 FIX #16150 2021-02-10 02:57:08 +01:00
Laurent Destailleur
13e0d08cbb Code comment 2021-02-10 02:49:54 +01:00
Laurent Destailleur
d80f23589d Fix missing entry 2021-02-10 02:39:58 +01:00
Laurent Destailleur
29100a4766 FIX #16221 2021-02-10 02:28:22 +01:00
Laurent Destailleur
667963094f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-10 02:17:14 +01:00