lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,454 Commits 43 Branches 150 Tags 886 MiB
a2ef7bc61e
Commit Graph

8539 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
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +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
Laurent Destailleur
1f02b33195 Work on inventory 2020-08-05 12:25:26 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +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
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +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
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +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
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +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
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +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
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +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
a2dd80bcc8 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:07:39 +02:00
Laurent Destailleur
b63a6bc72a NEW Can use dynamic code into the 'enabled' property of DAO fields 2020-07-26 20:45:54 +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
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
 2020-07-24 00:07:57 +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
0d24b979c1 Fix phpcs 2020-07-11 01:20:20 +02:00
Laurent Destailleur
bb056fc811 Fix bad return value 2020-07-10 03:02:49 +02:00
Laurent Destailleur
f2c84fba3d
Merge pull request #14202 from pstructures/PSdevelop 
Added Hook to showOptionals Function
 2020-07-10 02:54:05 +02:00
Laurent Destailleur
96c583b84e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:28:34 +02:00
Laurent Destailleur
87913e8a5c Fix prospect before customer 2020-07-10 02:11:23 +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
Matt Sidnell
39104009ef Updated to match inline with code received from fork 2020-07-08 14:25:37 +01:00
Matt Sidnell
580b9db3e7 Updated Hook in showOptionals function to allow the manipulation of optional fields on cards etc... 2020-07-08 14:20:59 +01: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
70c3146aba
Merge pull request #14106 from OPEN-DSI/new-extrafields-category-multi-select-with-link 
NEW show links for select and multi-select in category extra field
 2020-07-06 12:12:31 +02:00
Laurent Destailleur
eb7f3b81d3
Merge pull request #14187 from atm-john/10.0_fix_email_spoofing 
Fix email spoofing - with hidden conf
 2020-07-06 12:01:35 +02:00
Laurent Destailleur
42917000a3
Update CMailFile.class.php 2020-07-06 12:01:00 +02:00
Laurent Destailleur
2f04b4c559
Update CMailFile.class.php 2020-07-06 12:00:14 +02:00
stickler-ci
cb7b66d52c Fixing style errors. 2020-07-06 09:19:27 +00:00
Alexandre SPANGARO
82c96a4f83 Fix SticklerCi 2020-07-06 04:47:27 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02: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
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
94188af270
Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab 
NEW multiselect type and date to date filter
 2020-07-03 00:57:44 +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
a08e4bdf3f
Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop 
NEW get all child recursively
 2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da
Update commonobject.class.php 2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875
Merge pull request #14159 from Je2fb/develop 
FIX #14143 DynamicPrice
 2020-07-03 00:25:38 +02:00
Laurent Destailleur
6b16f64928 Fix properties used that does not exists 2020-07-02 03:39:47 +02:00
Laurent Destailleur
ca769a3c62 Fix scrutinizer errors 2020-07-02 03:37:01 +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
Laurent Destailleur
226c907e35 FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:00:52 +02:00
John Botella
2a9311b2d8 Fix email spoofing - with hidden conf 2020-07-01 16:55:23 +02:00
quentin
d2a364eea8 NEW get all child recursively 2020-07-01 14:10:43 +02:00
quentin
39651953b3 FIX refacto 2020-07-01 14:04:41 +02:00
quentin
267aa7605b Merge remote-tracking branch 'dolibarr/develop' into NEW_filter_on_event_tab 2020-07-01 14:00:49 +02:00
Laurent Destailleur
b8ea58f18c Fix phpcs 2020-06-30 16:15:10 +02:00
Laurent Destailleur
4baa00ba89 Fix phpcs 2020-06-30 13:20:46 +02:00
Laurent Destailleur
88cf904ced Fix edit of tag of website 2020-06-30 02:50:58 +02:00
Laurent Destailleur
bb74804b74 NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT 2020-06-29 17:58:04 +02:00
Francis Appels
5d65b5f660 fix html should not do price2num 2020-06-29 09:07:54 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
b725aca8aa
Merge branch 'develop' into 11.0_bug 2020-06-28 21:19:11 +02:00
Laurent Destailleur
a3ae7a76b8 WIP Stock at date 2020-06-28 19:35:24 +02:00
Je2fb
245ba93895
fix #14143 2020-06-28 17:53:48 +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
4d01030fd9 Fix phpcs 2020-06-27 02:00:42 +02:00
Laurent Destailleur
ec5cfee150 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-27 01:57:18 +02:00
Laurent Destailleur
443558e3a2 Fix phpcs 2020-06-27 01:57:01 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +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
b0d46d0c4c Code comment 2020-06-26 18:56:05 +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
e2b1b853c0 Minor performance enhancements 2020-06-26 01:44:21 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +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
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Regis Houssin
32844a8d0c FIX clean code 2020-06-22 09:26:42 +02:00
lvessiller
bf338b4d4f NEW show links for select and multi-select in category extra field 2020-06-22 08:57:52 +02:00
Laurent Destailleur
1ce5b78a6b Fix error message not reported 2020-06-22 01:02:17 +02:00
Regis Houssin
9a4f5e3d9a FIX We force "modify" for avoid some field not modify 2020-06-21 21:10:51 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Regis Houssin
03fbd72d66 FIX For better compatibility with Samba4 AD 2020-06-21 19:52:15 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
Laurent Destailleur
2de3eb8ac0 Fix CSS 2020-06-20 00:00:17 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
Laurent Destailleur
9ec8051a37 NEW Add param to not show links when output tags 2020-06-16 02:56:48 +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
012574b487
Update html.form.class.php 2020-06-12 00:51:19 +02:00
Laurent Destailleur
d7cbd8a1d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-11 23:41:43 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +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
073a4acd10
Merge pull request #14058 from indelog/showmailpj 
NEW Add show preview for mail attachement on form mail
 2020-06-11 23:09:26 +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
Laurent Destailleur
c289001507 Fix bad definition of field for parent 2020-06-11 18:31:26 +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
DEMAREST Maxime (Indelog)
e628730a3f Add show preview for mail attachement on form mail 2020-06-09 11:35:46 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
atm-quentin
3dd7c81f54 FIX stickler 2020-06-08 15:58:20 +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
atm-quentin
69db790cf5 NEW multiselect type and date to date filter 2020-06-08 14:43:14 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +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
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +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
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
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
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
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
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
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
Laurent Destailleur
0362d28cf7
Update commonobject.class.php 2020-06-01 20:13:27 +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
Laurent Destailleur
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +02:00
florian HENRY
2337d75d92 better fix for #13968 2020-06-01 10:43:57 +02:00
Laurent Destailleur
4af17a342c Doc 2020-06-01 00:00:24 +02:00
Laurent Destailleur
c04903d15c Fix debug modulebuilder for doc and ref generation 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae Fix debug modulebuilder for doc and ref generation 2020-05-31 22:59:33 +02:00
ptibogxiv
a33f503a0d
FIX php error 
Fatal error: Uncaught Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Error: Call to undefined function getCountry() in /volume2/web/dolibarr/htdocs/core/class/html.form.class.php on line 2583 Call Stack: 0.0001 409544 1. {main}() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:0 0.1935 3017200 2. Form->select_produits() /volume2/web/dolibarr/htdocs/adherents/admin/adherent.php:215 0.1935 3017200 3. Form->select_produits_list() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2134 0.1983 3439880 4. Form->constructProductListOption() /volume2/web/dolibarr/htdocs/core/class/html.form.class.php:2451
 2020-05-31 14:28:41 +02:00
bahfir abbes
f76c025a7b fix:this is required to navigate by id 2020-05-31 02:01:33 +01:00
bahfir abbes
e5a51eb732 fix:bad database quotation for booleans 2020-05-31 01:41:04 +01:00
bahfir abbes
d6247bfc97 fix:le résultat de explode est troujours un array 2020-05-31 01:23:35 +01:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList 
NEW Use new category API for project list view
 2020-05-30 17:22:43 +02:00
Laurent Destailleur
7fc6917cfd Debug feature of alternate languages 2020-05-29 22:01:02 +02:00
Laurent Destailleur
b3118d0189 Debug feature of alternate languages 2020-05-29 21:59:33 +02:00
Laurent Destailleur
c2a9819daa Debug establishment management 2020-05-29 21:45:50 +02:00
Laurent Destailleur
b11ef125c3 FIX Force of HTML content only for ckeditor 
Conflicts:
	htdocs/modulebuilder/index.php
 2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f FIX Force of HTML content only for ckeditor 2020-05-29 03:26:05 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2020-05-28 20:17:26 +02:00
Laurent Destailleur
1992b633ba Fix phpcs 2020-05-28 20:02:07 +02:00
stickler-ci
56259bae9a Fixing style errors. 2020-05-28 14:18:00 +00:00
glu000
9915d97adf Fix #13991 2020-05-28 16:11:02 +02:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
f66555b396 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
Laurent Destailleur
689289acd0 Doc 2020-05-27 23:20:26 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
ceda05a879 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-05-27 14:39:19 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Laurent Destailleur
0b48ffe3cd Removed not used var $useglobalvars 2020-05-27 11:38:28 +02:00
Laurent Destailleur
00484d5938 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 23:23:31 +02:00
Laurent Destailleur
9aeb79e80c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b FIX Default bank account was not loaded for document generation. 2020-05-26 23:22:14 +02:00
Laurent Destailleur
da8bd7507e NEW Add mass action to set category on a list of website pages. 2020-05-26 22:29:46 +02:00
Laurent Destailleur
3aaefd15b0 Fix set of categories 2020-05-26 01:07:43 +02:00
Laurent Destailleur
5f90596bb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 00:20:36 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 
add new rule
 2020-05-26 00:20:12 +02:00
Laurent Destailleur
f9f5beb064 NEW Can set tags/categories to website pages. 2020-05-26 00:19:32 +02:00
Laurent Destailleur
80ace3b52c Revert due to regressions 2020-05-25 23:05:29 +02:00
Laurent Destailleur
a80270ebb5 Revert "clean" 
This reverts commit 7e7a10f8d2.
 2020-05-25 23:01:25 +02:00
Laurent Destailleur
faf7a379ba Revert "clean" 
This reverts commit 8f9ee3250d.
 2020-05-25 23:01:20 +02:00
Laurent Destailleur
26eab1f285
Merge pull request #13782 from frederic34/free_email 
NEW enable free emails input with select2
 2020-05-25 22:55:36 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Laurent Destailleur
0b9e1e6ec6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:01:49 +02:00
Laurent Destailleur
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
47465f4108 Fix for situation invoice (exclude credit not when searching last 
invoice to use)
 2020-05-25 00:20:00 +02:00
Laurent Destailleur
aee6fce9f8 Fix remove bad use 2020-05-24 20:04:26 +02:00
Frédéric FRANCE
a7e0fe24ff
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-23 21:44:14 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
acaab1fd45 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:49:15 +02:00
gael.langlais
af5de05a31 Change some curly braces #13929 2020-05-23 13:38:50 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Frédéric FRANCE
3a786ca766
add new rule 2020-05-21 15:25:42 +02:00
stickler-ci
459154edc0 Fixing style errors. 2020-05-21 13:11:06 +00:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c Clean CSS, clean code 2020-05-21 13:06:36 +02:00
Frédéric FRANCE
def53338de
add new rule 2020-05-21 09:07:10 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +02:00