Commit Graph

93485 Commits

Author SHA1 Message Date
Alexandre SPANGARO
77a43c51f9 FIX: Accountancy - Search_not_reconciled 2021-01-22 15:10:23 +01:00
Laurent Destailleur
7e8d06e8b8 Fix update default contact type 2021-01-22 14:10:08 +01:00
Laurent Destailleur
93ca27d808 FIX #16041 2021-01-22 13:17:27 +01:00
Laurent Destailleur
ad2f5ea7c1 Update website template 2021-01-22 12:39:59 +01:00
Laurent Destailleur
242a0a54be Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-22 10:52:07 +01:00
Laurent Destailleur
cf11f356e8 Fix load of data are not complete 2021-01-22 10:51:47 +01:00
Laurent Destailleur
641e2d9906
Merge pull request #16042 from aspangaro/13a29
Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero
2021-01-22 02:20:16 +01:00
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
b25f65c995 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/projet/info.php
2021-01-22 01:09:35 +01:00
Laurent Destailleur
5aba1f9ccd FIX missing socid into link to create event from project agenda tab 2021-01-22 01:07:45 +01:00
Alexandre SPANGARO
0598656be7 FIX: Accountancy - Search_not_reconciled 2021-01-21 21:23:31 +01:00
Alexandre SPANGARO
939f27deed Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero 2021-01-21 20:55:46 +01:00
Laurent Destailleur
8076d47b8a FIX #15980 2021-01-21 19:08:03 +01:00
Laurent Destailleur
7982cab526 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
	htdocs/ticket/card.php
2021-01-21 18:34:55 +01:00
Laurent Destailleur
0e684abceb
Merge pull request #16039 from ATM-Consulting/fix/12.0_ticket_extrafields_of_type_date_are_not_saved
FIX 12.0 - ticket extrafields of type 'date' are not saved
2021-01-21 18:27:36 +01:00
Laurent Destailleur
0f7bdef1c1 FIX in pages of balances 2021-01-21 18:02:17 +01:00
BlackMirror
a55d23f363 [FM] FIX - ticket extrafields of type 'date' are not saved 2021-01-21 15:55:52 +01:00
Laurent Destailleur
039cb0685b Fix default filter 2021-01-21 14:43:57 +01:00
Laurent Destailleur
c3ad443200 Fix var not defined 2021-01-21 13:52:23 +01:00
Laurent Destailleur
69479584ed Fix $ok is not used 2021-01-21 13:50:31 +01:00
Laurent Destailleur
12b3b72fe3
Merge pull request #16028 from ATM-Consulting/fix/12.0_pdf_strato_label_instead_of_ref
[FM] Fix 12.0 - duplicate label, probably mistaken for ref
2021-01-21 13:25:54 +01:00
Laurent Destailleur
d1af419d02 More log to debug payment errors 2021-01-21 11:50:15 +01:00
BlackMirror
640cf50b7f [FM] Fix 12.0 - duplicate label, probably mistaken for ref 2021-01-20 15:20:50 +01:00
Laurent Destailleur
79308b332b Trans 2021-01-20 11:41:17 +01:00
Laurent Destailleur
803ae91136 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-19 16:20:19 +01:00
Laurent Destailleur
755de9fff2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-19 16:19:46 +01:00
Laurent Destailleur
a0fe2a8abc
Merge pull request #16022 from frederic34/patch-1
Update .gitignore
2021-01-19 16:19:26 +01:00
Laurent Destailleur
fd65a2adc1 FIX #15955 2021-01-19 16:04:21 +01:00
Laurent Destailleur
560d401cff Code comment 2021-01-19 15:54:24 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Frédéric FRANCE
b2d790b46a
Update .gitignore 2021-01-19 14:27:31 +01:00
Laurent Destailleur
2d8ca513d6 Fix param 'all' 2021-01-19 12:55:24 +01:00
Laurent Destailleur
03d8c6bfd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/paiement_charge.php
2021-01-19 10:59:42 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Laurent Destailleur
6d251e6a43
Merge pull request #15963 from FHenry/13.0
fix thirdparty list filter type_ent can be empty
2021-01-18 19:21:58 +01:00
Laurent Destailleur
d69ce5b917
Merge pull request #15952 from FHenry/12_fix_autofill_date_payment
12 fix autofill date payment
2021-01-18 19:20:33 +01:00
Laurent Destailleur
11adbb7b73
Merge pull request #16006 from hregis/fix_update_db_model
FIX try to save again (no changes)
2021-01-18 19:19:10 +01:00
lmarcouiller
21141f0788 Fix #16010 update fournisseur.product.class.php 2021-01-18 19:18:10 +01:00
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +01:00
David Bensel
9813cb430a FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 19:14:12 +01:00
Florian HENRY
6b61545189 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fix_autofill_date_payment 2021-01-18 19:07:30 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0
extrafeild selllist can be use with string fk
2021-01-18 18:53:01 +01:00
Laurent Destailleur
bb752fa83d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
2021-01-18 18:50:57 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend
FIX : missing GETPOST parameters on card_presend.tpl.php
2021-01-18 18:49:28 +01:00
Regis Houssin
26e74d56b3 FIX try to save again (no changes) 2021-01-18 15:28:06 +01:00
Laurent Destailleur
a109dd8948 Fix removed unexpected values in stats graph
Conflicts:
	htdocs/projet/graph_opportunities.inc.php
2021-01-18 13:55:11 +01:00
Laurent Destailleur
b46d1fa6a1 Fix removed unexpected values in stats graph 2021-01-18 13:51:35 +01:00
Laurent Destailleur
512745920a css 2021-01-18 13:47:29 +01:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +01:00