Commit Graph

95981 Commits

Author SHA1 Message Date
Laurent Destailleur
47ac349f2d
Update list.php 2021-02-03 20:34:57 +01:00
Laurent Destailleur
2576973dc3
Merge pull request #16140 from OPEN-DSI/v11-fix-model-mail-selected
FIX select default mail template
2021-02-03 20:26:40 +01:00
Laurent Destailleur
83e32f96b7
Merge pull request #16138 from ibuiv/patch-3
FIX(path) htdocs removed
2021-02-03 20:25:02 +01:00
Laurent Destailleur
3b8b0d59ba
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
2021-02-03 20:24:44 +01:00
Laurent Destailleur
fb75da809b
Merge pull request #16145 from prietojc/patch-15
FIX generating SEPA file
2021-02-03 19:58:00 +01:00
Laurent Destailleur
c16ed62ada
Merge pull request #16149 from ptibogxiv/patch-410
FIX cash fence for takepos with multientity
2021-02-03 19:57:21 +01:00
Laurent Destailleur
3798892fd3 FIX Hide/Unhide external ICSS calendars 2021-02-03 19:53:28 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
c9e232f2ff Try to fix import/export timeout by dynamic increase 2021-02-03 18:00:27 +01:00
Damien BENOIT
4003ed1e8c
Merge pull request #7 from Dolibarr/develop
Update
2021-02-03 17:42:32 +01:00
Laurent Destailleur
153d3855ad Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-03 17:20:26 +01:00
Laurent Destailleur
5a969539d2 Better log 2021-02-03 17:20:05 +01:00
Laurent Destailleur
92942870dc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2021-02-03 17:12:44 +01:00
Laurent Destailleur
8b6de8fe26 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 17:09:56 +01:00
Laurent Destailleur
6ab723e85c Fix bad path of include 2021-02-03 17:09:26 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
Laurent Destailleur
bf2defbef4 More complete log 2021-02-03 12:04:28 +01:00
stickler-ci
609428bc09 Fixing style errors. 2021-02-03 10:37:15 +00:00
Anthony Berton
eb15c4d800 20200203 2021-02-03 11:29:54 +01:00
ptibogxiv
3132877349
FIX cash fence for takepos with multientity 2021-02-02 23:09:23 +01:00
Laurent Destailleur
29410cac6f Fix phpcs 2021-02-02 16:22:16 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
2021-02-02 16:17:53 +01:00
Laurent Destailleur
c7a4baf7c5 Fix phpunit export excel2007 2021-02-02 16:14:40 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Laurent Destailleur
217989d0e2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-02 15:37:40 +01:00
Laurent Destailleur
bd9eb4c949 FIX Assignement of actors on tasks 2021-02-02 15:36:54 +01:00
Laurent Destailleur
fed99aa3bb FIX Assignement of actors on tasks 2021-02-02 15:35:40 +01:00
Francis Appels
24a23f9fd0 Show consumption unitcost as price. 2021-02-02 14:13:59 +01:00
Laurent Destailleur
3021c22198 Clean files 2021-02-02 13:49:03 +01:00
Laurent Destailleur
31aebf3457 Fix log 2021-02-02 13:44:54 +01:00
Florian HENRY
d3d0617996 fix: manage price min for PRODUIT_CUSTOMER_PRICES 2021-02-02 13:43:33 +01:00
JC Prieto
f11037c6bf
Update bonprelevement.class.php
Bad sender ICS_transfer
2021-02-02 13:40:09 +01:00
Laurent Destailleur
6b32fd33fd Fix export with excell 2021-02-02 13:33:44 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
2021-02-02 13:22:23 +01:00
Laurent Destailleur
85357a34c8 Fix style of injected combo to select variant 2021-02-02 13:12:12 +01:00
Laurent Destailleur
b80de4aeaf FIX CSRF errors on margin forms 2021-02-02 13:04:41 +01:00
Francis Appels
b685a7549e add newline at end of file 2021-02-02 12:19:34 +01:00
Francis Appels
dae997dd4c Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp 2021-02-02 12:18:19 +01:00
Francis Appels
1f295923fc Show also unit cost iso pmp value for consumption 2021-02-02 12:12:39 +01:00
Laurent Destailleur
7ff5cd50c3 Fix responsive 2021-02-02 11:41:32 +01:00
Laurent Destailleur
c94ecb8a42 Limit list of draft element in home sections 2021-02-02 11:34:34 +01:00
Francis Appels
731ca02789 Use new origin field to mark free lines.
Allow add free line when production started
2021-02-02 11:19:58 +01:00
Laurent Destailleur
1fd2f12673 Fix responsive 2021-02-02 11:16:25 +01:00
Laurent Destailleur
c2db7ccf14 Look and feel v14 2021-02-02 11:15:24 +01:00
Laurent Destailleur
3b9bd3cc40 Fix responsive 2021-02-02 11:15:16 +01:00
Francis Appels
45970ac443 Update database with new fields 2021-02-02 11:13:14 +01:00
Laurent Destailleur
218a76ee63 FIX SQL Error with postgres or mysql strict mode 2021-02-02 11:06:58 +01:00
kamel
506ba822e9 FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql 2021-02-02 11:06:01 +01:00
Laurent Destailleur
95e255747f Fix accent on graph of expense report 2021-02-02 10:53:59 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00