Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
87,477 Commits 36 Branches 190 Tags
2f5dbdc8a3a2bc5183432bb0014b5eb4794a6c20
Commit Graph

20632 Commits

Author SHA1 Message Date
Laurent Destailleur
87806346c7 Update commonobject.class.php 2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da Update commonobject.class.php 2020-06-06 21:37:53 +02:00
Laurent Destailleur
a66926cf08 Update commonobject.class.php 2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67 Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets 
FIX : Tickets mail models doesn't work
 2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b Update html.formticket.class.php 2020-06-06 21:23:35 +02:00
Laurent Destailleur
233810d41d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 20:37:36 +02:00
Laurent Destailleur
123265bf4c Fix redirect url in multilang 2020-06-06 20:37:17 +02:00
Laurent Destailleur
88aaec63f7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 18:57:41 +02:00
Laurent Destailleur
e31e889595 Add url in error message 2020-06-06 18:30:04 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
florian HENRY
699557adbe forget[] 2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737 forget[] 2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0 2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d Fixing style errors. 2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c fix comment 2020-06-04 20:20:43 +02:00
florian HENRY
9a3e68b594 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-04 20:14:29 +02:00
florian HENRY
7115bd7033 better fix 2020-06-04 20:14:19 +02:00
Alexandre SPANGARO
ede084a111 Fix stickler 2020-06-04 05:11:00 +02:00
Alexandre SPANGARO
9e5c7d0acf FIX: Show ref_customer, amount on contract link object 2020-06-03 23:00:53 +02:00
Laurent Destailleur
bd56210e97 doc 2020-06-03 19:24:26 +02:00
Laurent Destailleur
7f1fea1e09 Add json-ld structure 'qa' 2020-06-03 19:23:36 +02:00
Laurent Destailleur
474860d546 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59 Fix webp support 2020-06-03 14:05:18 +02:00
Laurent Destailleur
8023bc2fbb Fix cancel in media filemanager 2020-06-03 12:39:06 +02:00
Laurent Destailleur
ae3d786593 Fix crop on media file manager 
Conflicts:
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/photos_resize.php
	htdocs/theme/eldy/global.inc.php
 2020-06-03 12:38:42 +02:00
Laurent Destailleur
93320deddc Fix cancel in media filemanager 2020-06-03 12:34:09 +02:00
Laurent Destailleur
8894570054 Fix crop on media file manager 2020-06-03 11:20:59 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
a37a4031e9 FIX Delete of website page need permission. Conflict with mass action. 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:02:19 +02:00
Laurent Destailleur
d4db1836d1 FIX Delete of website page need permission. Conflict with mass action. 2020-06-03 00:46:09 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
658e7a2f87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:09 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
9651b5a7c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-02 13:31:33 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
c6a53d9b3d Update pdf_blochet.class.php 2020-06-02 12:09:11 +02:00
DEMAREST Maxime (Indelog)
7189e060e0 Fix line heiht overflow for blochet template 
Fixed if by adding dynamic line height calculation. Now line height depend on
bank field content or transmitter field content. You can use long text in this
fields.
 2020-06-02 11:17:37 +02:00
Laurent Destailleur
6ddabd51c0 Update commonobject.class.php 2020-06-01 21:03:42 +02:00
bahfir abbes
f2c7db63cf fix:le résultat de explode est troujours un array 2020-06-01 21:02:45 +02:00
Laurent Destailleur
14a3ab68e6 Merge pull request #14008 from bafbes/abb110217 
fix:the result of explode is always an array
 2020-06-01 21:02:15 +02:00
Laurent Destailleur
d3a769a0ab Update commonobject.class.php 2020-06-01 21:02:05 +02:00
bahfir abbes
cb551cfd5a fix:non editable fields must not be editable in creation either 2020-06-01 20:58:20 +02:00
Laurent Destailleur
56e5a3dae6 Merge pull request #14009 from bafbes/abb110218 
fix:non editable fields must not be editable in creation either
 2020-06-01 20:57:55 +02:00
Laurent Destailleur
0f5eed60a2 Update commonobject.class.php 2020-06-01 20:41:12 +02:00
bahfir abbes
2984edc752 fix:bad database quotation for booleans 2020-06-01 20:40:51 +02:00
Laurent Destailleur
9bf69f11c4 Merge pull request #14010 from bafbes/abb110220 
fix:bad database quotation for booleans
 2020-06-01 20:39:58 +02:00
Laurent Destailleur
2dac87621a Update commonobject.class.php 2020-06-01 20:39:49 +02:00
Laurent Destailleur
69c3b4b4ea Merge pull request #14015 from ptibogxiv/patch-342 
FIX php error
 2020-06-01 20:17:22 +02:00
Laurent Destailleur
b20e8b9d6b Merge pull request #14013 from bafbes/abb110222 
fix:this is required to navigate by id
 2020-06-01 20:15:48 +02:00