lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,004 Commits 43 Branches 150 Tags 886 MiB
8ad5dc81de
Commit Graph

8226 Commits

Author SHA1 Message Date
Laurent Destailleur
030df58fea Fix regression in sending emails 2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e Fix regression in sending emails 2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3 Fix regression in sending emails 2020-08-07 17:06:12 +02:00
Laurent Destailleur
00804c1020 Complete fix for #14146 2020-08-07 15:19:26 +02:00
Laurent Destailleur
284378232b
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam 
FIX :  JS CRASH - bad usage of moreparam
 2020-08-07 10:10:09 +02:00
florian HENRY
46cafcc445 Merge branch '11.0' into 12.0 2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf Merge branch '10.0' into 11.0 2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method 2020-08-06 16:28:17 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
VERDOL Gauthier
2d192431bc FIX : wrong element var for fetch_name_optionals_label function with expeditions 2020-08-03 14:59:51 +02:00
Laurent Destailleur
defbd26f95 Help to fight errors ErrorBadValueForParamNotAString 2020-08-03 12:33:22 +02:00
Laurent Destailleur
c2bb0431f0 FIX input field of extrafields must keep data if form submit fails. 2020-08-03 12:31:30 +02:00
Laurent Destailleur
d59bcd3f5b FFIX error creating record when extrafields price exists in other entity 2020-08-03 12:08:33 +02:00
Laurent Destailleur
ecfdb4bbac Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-02 16:02:09 +02:00
Laurent Destailleur
5e6254634f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-02 16:01:13 +02:00
Laurent Destailleur
1edfa4a4fb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-08-02 16:01:03 +02:00
Laurent Destailleur
8c4b4e233d
Merge pull request #14317 from fappels/12_show_virtual_stock 
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
 2020-08-02 01:32:18 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
altairis
9a9eef428b fix duration fields size with firefox 2020-07-31 12:22:21 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
8b879ee23b FIX Edit extrafield of type long text loose carriage returns 2020-07-30 14:49:00 +02:00
Francis Appels
54410189bc Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO 
When product ajax search used a dash is show, so virtual stock looks like being negative value.
 2020-07-29 17:00:39 +02:00
Laurent Destailleur
3d79950c27
Update commonobject.class.php 2020-07-29 14:13:29 +02:00
Laurent Destailleur
714481f7e5 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:08:31 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve 
Improve printStdColumnContent by passing the $pdf object
 2020-07-24 13:20:03 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Laurent Dinclaux
3cdabbaaff Explicitly pass the pdf object by reference in the printStdColumnContent hook call. 2020-07-19 21:53:06 +11:00
Laurent Destailleur
cbc8187616
Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering 
Fix extrafields ordering on PDFs
 2020-07-18 19:30:34 +02:00
Laurent Destailleur
b8721e0c64 FIX Change position of line in BOM 2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e Fix extrafields ordering on PDFs 2020-07-10 00:51:41 +11:00
Laurent Dinclaux
37401df106 Improve printStdColumnContent by passing the $pdf object. 
It isn't possible to replace the pdf edition done by this method without the $pdf object.
 2020-07-08 14:48:34 +11:00
Laurent Destailleur
b726e96f4b FIX Update form erased extrafields that were hidden 2020-07-04 17:09:20 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
03aa4873d1
Merge pull request #14141 from fappels/12_fix_extrafield_html 
FIX html lost on html extrafield
 2020-07-03 00:49:31 +02:00
Laurent Destailleur
fd617658ef Fix syntax 2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d fix #14143 2020-07-03 00:34:50 +02:00
Laurent Destailleur
d3c23428d5 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:01:46 +02:00
Francis Appels
5d65b5f660 fix html should not do price2num 2020-06-29 09:07:54 +02:00
Francis Appels
731978fda6 FIX html lost on html extrafield 2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f Fix load of menu when 'perm' or 'enabled' is '0'. 2020-06-27 15:27:09 +02:00
Laurent Destailleur
443558e3a2 Fix phpcs 2020-06-27 01:57:01 +02:00
Laurent Destailleur
3655f6f407 FIX #14109 2020-06-26 20:38:41 +02:00
Laurent Destailleur
6df049e05c FIX #14112 2020-06-26 20:35:06 +02:00
Laurent Destailleur
d6346522b8 Code comment 2020-06-26 19:36:15 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
gauthier
858a751eef FIX : $_POST must be GETPOST 2020-06-26 10:51:04 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Laurent Destailleur
1ce5b78a6b Fix error message not reported 2020-06-22 01:02:17 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
2de3eb8ac0 Fix CSS 2020-06-20 00:00:17 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00
Laurent Destailleur
1ba03566dc Fix case of delete contact not correctly implemented. 2020-06-12 02:15:02 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
e04557948d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
 2020-06-11 23:36:55 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php 2020-06-11 22:58:58 +02:00
Laurent Destailleur
ee611fa7a0 Fix bad definition of field for parent 2020-06-11 18:32:05 +02:00
gauthier
58ff96af30 FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php 2020-06-10 16:48:02 +02:00
DEMAREST Maxime (Indelog)
1ac341e651 Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list 2020-06-09 15:33:10 +02:00
Laurent Destailleur
f4f0da6de2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39 Show more info to help fix corrupted data 2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1 Error message 2020-06-08 15:12:07 +02:00
Laurent Destailleur
09047dc19c Doc 2020-06-07 19:26:37 +02:00
Laurent Destailleur
81c80b254e Fix lang property on database menu entry was not propagated 2020-06-07 19:25:25 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Laurent Destailleur
b221c65165 Merge 2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php 2020-06-06 21:47:27 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php 2020-06-06 21:41:33 +02:00
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
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
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
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
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
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +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
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
69c3b4b4ea
Merge pull request #14015 from ptibogxiv/patch-342 
FIX php error
 2020-06-01 20:17:22 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
 2020-06-01 16:47:50 +02:00
florian HENRY
2337d75d92 better fix for #13968 2020-06-01 10:43:57 +02:00