Commit Graph

103220 Commits

Author SHA1 Message Date
Marc de Lima Lucio
8a647f3f5b FIX: deposit payment terms: sql syntax error 2021-10-05 14:01:34 +02:00
Marc de Lima Lucio
6ed9e00b4d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-05 13:35:50 +02:00
Marc de Lima Lucio
f4c22c0ae7 FIX: deposit payment terms: PHPDoc 2021-10-05 13:02:12 +02:00
Marc de Lima Lucio
4059b64288 FIX: deposit payment terms: langs 2021-10-05 13:00:25 +02:00
Marc de Lima Lucio
cd1eb3b992 FIX: deposit payment terms: PHPDoc 2021-10-05 12:53:04 +02:00
Marc de Lima Lucio
fe62808595 NEW: deposit payment terms: hidden conf to detail lines imported from origin 2021-10-05 12:37:29 +02:00
Laurent Destailleur
379dd9ccbb Fix position of text 2021-10-05 12:09:03 +02:00
Marc de Lima Lucio
b06857136a NEW: deposit payment terms: show percentage on proposal/order PDFs 2021-10-05 11:31:03 +02:00
Marc de Lima Lucio
47b9941203 FIX: deposit payment terms: show correct percentage is proposal/order lists 2021-10-05 11:18:49 +02:00
Marc de Lima Lucio
54782f5d4c FIX: deposit payment terms: don't show percentage input on lists 2021-10-05 11:11:27 +02:00
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +02:00
Marc de Lima Lucio
337531f832 FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices 2021-10-05 10:54:22 +02:00
Laurent Destailleur
f0703b414a css 2021-10-05 10:24:31 +02:00
Laurent Destailleur
355f17be3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop
New : Add showdocument hook
2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php 2021-10-04 19:20:37 +02:00
Laurent Destailleur
2ef65a2877 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-04 19:08:38 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Laurent Destailleur
ee4276e0aa Error message 2021-10-04 19:03:14 +02:00
Marc de Lima Lucio
f5aebc8efd NEW: deposit payment terms: generate deposit from orders 2021-10-04 18:31:32 +02:00
Marc de Lima Lucio
cfc78a17f7 FIX: deposit payment terms: bad test for already existing deposit 2021-10-04 18:21:28 +02:00
Marc de Lima Lucio
1b2494855d NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI 2021-10-04 18:09:24 +02:00
Laurent Destailleur
f7f8ff2df2
Merge pull request #18862 from marc-dll/NEW_expense_report_overlap_link
NEW: expense report: show link to already existing overlapping expense report
2021-10-04 15:37:49 +02:00
Laurent Destailleur
6f4c3cba6f
Merge pull request #18891 from stepanych/develop
Fix #18875
2021-10-04 15:33:13 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
2021-10-04 15:32:40 +02:00
Marc de Lima Lucio
6580c2e308 FIX: deposit payment terms: correctly untag deposit as created from an origin 2021-10-04 15:07:27 +02:00
Marc de Lima Lucio
087157890e FIX: deposit payment terms: unused variable 2021-10-04 15:06:52 +02:00
Laurent Destailleur
bad5d87f57 NEW theme option THEME_ELDY_USEBORDERONTABLE 2021-10-04 14:56:30 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
2021-10-04 14:53:44 +02:00
Laurent Destailleur
6d8276c9c8 Doc 2021-10-04 12:59:53 +02:00
Laurent Destailleur
91ee704dc3 Move trans from admin to main 2021-10-04 12:16:50 +02:00
Marc de Lima Lucio
704bae46a6 FIX: expense report: show link to already existing overlapping expense report without adding new parameter 2021-10-04 08:51:31 +02:00
Laurent Destailleur
66310b14d7 Better way to present open invoice graph 2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
b6ec7ae77a Fix permissions on module PaymentByBankTransfer 2021-10-04 04:36:58 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
e46d064d5e Clean text 2021-10-03 20:36:03 +02:00
Laurent Destailleur
7c573da4b0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-03 19:31:09 +02:00
Laurent Destailleur
6a6678438f Update doc 2021-10-03 19:30:51 +02:00
Laurent Destailleur
2c32c6c5c9 Fix contextpage for list of tickets 2021-10-03 19:17:23 +02:00
Laurent Destailleur
e558adbcfc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-03 18:20:34 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Alexandre SPANGARO
42bb9ac6d2 Better URL 2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
94166cdb7e FIX Remove Isle of Man of ECC's countries 2021-10-03 05:36:53 +02:00
Alexandre SPANGARO
042d520061 Change Url 2021-10-03 05:30:49 +02:00
stepanych
b1eb1c1070 fix issue #18875
added check for $$search_array_options
2021-10-03 01:08:22 +02:00
Laurent Destailleur
2f813e0b6a
Merge pull request #18832 from atm-gauthier/NEW/integration_GPEC_sql
NEW : integration HRM sql and migration files
2021-10-02 21:18:50 +02:00
Laurent Destailleur
b352d43baa
Merge pull request #18861 from marc-dll/NEW_expense_report_prefill_dates
NEW: expense reports: conf to pre-fill start/end dates with bounds of current month
2021-10-02 21:12:09 +02:00
Laurent Destailleur
705644bf07
Merge branch 'develop' into NEW_expense_report_prefill_dates 2021-10-02 21:11:59 +02:00