Commit Graph

19517 Commits

Author SHA1 Message Date
Laurent Destailleur
d08b3513dc
Merge pull request #14247 from FHenry/11.0_fix_commerce_MenuSupplierORderOnly
fix display Commerce top menu user only supplier order rights and MAIN_MENU_HIDE_UNAUTHORIZED=1
2020-07-29 14:27:14 +02:00
Laurent Destailleur
6a5427ee4f
Merge pull request #14274 from atm-quentin/FIX_null_required
FIX null required
2020-07-29 14:13:53 +02:00
Laurent Destailleur
3d79950c27
Update commonobject.class.php 2020-07-29 14:13:29 +02:00
Laurent Destailleur
930ae84dac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contact/list.php
	htdocs/core/lib/pdf.lib.php
2020-07-29 13:50:31 +02:00
Laurent Destailleur
566f683c54 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:19 +02:00
VERDOL Gauthier
25994e61bc FIX : We need to see unit line on PDF even though it's an option 2020-07-27 16:04:21 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/card.php
2020-07-25 00:17:28 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
2020-07-22 11:44:26 +02:00
florian HENRY
2c5e96bb28 better fix 2020-07-20 09:01:21 +02:00
florian HENRY
d2e528d8c1 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:45 +02:00
florian HENRY
3148a181e7 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:34 +02:00
Laurent Destailleur
fd95551940 Fix upload of file in import module
Conflicts:
	htdocs/core/lib/security.lib.php
2020-07-09 21:52:27 +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
8dee17446d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/company.lib.php
2020-06-28 21:46:08 +02:00
Laurent Destailleur
1194c61857
Merge pull request #14125 from ATM-Consulting/10.0_FIX_pgsql_on_company.lib.php_2
FIX 10.0 - fatal with postgreSQL
2020-06-28 21:20:20 +02:00
gauthier
858a751eef FIX : $_POST must be GETPOST 2020-06-26 10:51:04 +02:00
Florian Mortgat
ccfe6f18fe FIX 10.0 - fatal with postgres
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
2020-06-25 16:06:16 +02:00
Laurent Destailleur
6d6abd4320 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 13:42:38 +02:00
Laurent Destailleur
fdbb6debc9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-17 13:30:43 +02:00
Laurent Destailleur
6660923e94 FIX Privilege escalation reported by wizlynx WLX-2020-011 2020-06-17 13:29:43 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports
11.0 - FIX - missing currency columns in supplier exports
2020-06-16 22:00:56 +02:00
Florian Mortgat
18d5ec7750 11.0 - FIX - missing currency columns in supplier exports
(copy-pasted from modFacture.class.php)
2020-06-16 10:56:10 +02:00
Laurent Destailleur
72130dacb9
Merge pull request #14061 from atm-gauthier/10.0_fix_progress_pdf
FIX : percent must be displayed on one line
2020-06-12 14:50:49 +02:00
Laurent Destailleur
1ba03566dc Fix case of delete contact not correctly implemented. 2020-06-12 02:15:02 +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
9aafb82fd3
Merge pull request #14059 from atm-florianm/FIX_10.0_missing_global_langs_when_activating_modContrat
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
2020-06-11 23:02:19 +02:00
Laurent Destailleur
3698af39f1
Merge pull request #14060 from indelog/fix_measuringunitstring
Fix 11.0 -  undef func measuringUnitString() in From::select_produits_fournis…
2020-06-11 23:02:01 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php 2020-06-11 22:58:58 +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
Florian Mortgat
5bc80f8626 FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax 2020-06-10 16:22:48 +02:00
gauthier
92b89437d1 FIX : percent must be displayed on one line 2020-06-09 16:02:41 +02:00
DEMAREST Maxime (Indelog)
1ac341e651 Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list 2020-06-09 15:33:10 +02:00
Florian Mortgat
0a2099e0ac FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat 2020-06-09 14:22:32 +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
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
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
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
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Florian Mortgat
3213148d87 FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message 2020-06-01 17:12:02 +02:00
florian HENRY
2337d75d92 better fix for #13968 2020-06-01 10:43:57 +02:00
Laurent Destailleur
113144ea21
Merge pull request #13993 from glu000/11.0-fix-13991
Fix #13991
2020-05-28 18:27:39 +02:00
Laurent Destailleur
8360ca4b20
Update pdf_crabe.modules.php 2020-05-28 17:38:20 +02:00
Laurent Destailleur
bdc73b5cae
Update pdf_crabe.modules.php 2020-05-28 17:37:53 +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
atm-lena
edc6abcea8 FIX Rounding Total TVA in "crabe" model pdf 2020-05-28 15:19:37 +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
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +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
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
Laurent Destailleur
0cd05887ce FIX count of open day when date and start are not open should be 0 2020-05-07 17:21:27 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
Laurent Destailleur
d4400cf80f FIX links into emails of notifications 2020-05-07 11:39:32 +02:00
Laurent Destailleur
36a0780f14 More complete fix for #13817 2020-05-05 15:20:40 +02:00
atm-lena
78a427c996 FIX wrong user right's name to top menu "commercial" 2020-05-05 14:35:03 +02:00
Laurent Destailleur
d2d9ce3576
Merge pull request #13794 from atm-maxime/fix_addline_titles
Fix addline titles
2020-05-04 22:08:34 +02:00
Laurent Destailleur
2afd38e2f6 FIX Combo list of available users to filter on the list of leaves. 2020-05-04 21:59:31 +02:00
Laurent Destailleur
6d894b7abd Fix missing link in message 2020-05-04 19:08:31 +02:00
Maxime Kohlhaas
e0ebe85c13 Fix addline titles 2020-05-03 09:15:12 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
1c7873b4f4 FIX Sanitizing menu parameter 2020-05-01 15:53:56 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2020-04-30 11:52:30 +02:00
Laurent Destailleur
908e5d7f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/api/class/api_setup.class.php
2020-04-29 18:05:01 +02:00
Laurent Destailleur
84bca036c9 FIX Link missing into email of some notification 2020-04-29 18:03:28 +02:00
Laurent Destailleur
a0c013d87b Fix missing link
Conflicts:
	htdocs/core/class/notify.class.php
2020-04-28 19:18:31 +02:00
Laurent Destailleur
c22e13b138 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:27:42 +02:00
Laurent Destailleur
91523b4b64 FIX Can switch from double to price type for extrafields
Conflicts:
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
2020-04-28 14:27:22 +02:00
Laurent Destailleur
fe6fb12d18 Fix missing link 2020-04-27 17:13:23 +02:00
Laurent Destailleur
635b9bb0fe FIX #13641 2020-04-27 15:27:03 +02:00
Laurent Destailleur
fc1a1c6afe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 19:56:29 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2020-04-24 19:56:19 +02:00
Laurent Destailleur
df10b86d1f FIX consistency of price w/wo vat wrong when price entered with tax 2020-04-24 19:52:34 +02:00
gauthier
e98671e404 FIX : Access to undeclared static property: Contact::$table_element 2020-04-24 15:22:38 +02:00
Frédéric FRANCE
1aafd4667b
fix countable php7 warning 2020-04-24 11:57:23 +02:00
Laurent Destailleur
00e9ed1452
Merge pull request #13716 from atm-florian/11.0
fix: remove debug pring
2020-04-23 18:22:18 +02:00
Laurent Destailleur
6819255b76 FIX #13650 2020-04-23 13:49:18 +02:00
florian HENRY
7972174787 remove debug pring 2020-04-23 13:44:23 +02:00
Laurent Destailleur
de90f24bd4 Fix phpcs 2020-04-22 21:29:15 +02:00
Laurent Destailleur
6b8ff56c20 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/html.formother.class.php
2020-04-22 18:26:26 +02:00
Laurent Destailleur
80271cc852 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-22 18:24:00 +02:00
Laurent Destailleur
7bc8a70b0a FIX #13670 2020-04-22 18:23:48 +02:00
gauthier
43f4c5ac96 FIX : model export list must be sorted by label 2020-04-22 15:29:54 +02:00
Laurent Destailleur
c1d0cae24d
Merge pull request #13692 from hregis/11.0_bug
FIX missing fk_bank during export of suppliers invoices
2020-04-22 13:18:46 +02:00
Regis Houssin
f6f9ca48dd FIX missing fk_bank during export of suppliers invoices 2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6 fix: avoid php notice 2020-04-22 12:08:05 +02:00
Laurent Destailleur
ff5bf040e8 FIX text version of html emailing (removed the body style) 2020-04-21 11:19:27 +02:00
Maxime Kohlhaas
817e16d652 Fix birthdays boxes and filter on month 2020-04-18 20:01:18 +02:00
Laurent Destailleur
3e7f0b364e FIX #13611 2020-04-17 10:22:08 +02:00
Laurent Destailleur
26022f062f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-16 15:24:23 +02:00
Laurent Destailleur
984fa0d5a0 Fix hidden const 2020-04-16 15:24:12 +02:00
Laurent Destailleur
b540bb29e0
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status
FIX viewstatut to search status
2020-04-16 00:48:12 +02:00
Laurent Destailleur
86eaa78f1e FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
DOL_DOCUMENT_DIR.
2020-04-15 20:00:27 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
d143bd8aec FIX #13589 missing price_level in import of thirdparties 2020-04-14 21:22:08 +02:00
Laurent Destailleur
384cfeccf6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-12 21:38:51 +02:00
Laurent Destailleur
46ccd61009 Fix phpcs 2020-04-12 21:38:23 +02:00
Laurent Destailleur
0f71ee1e49
Merge pull request #13563 from simicar29/11.0
FIX #7594 Expense report multi pagebreak
2020-04-12 18:19:23 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php 2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php 2020-04-12 16:46:21 +02:00
TuxGasy
fecfe2e3a1 Keep compatibility with old object declaration 2020-04-11 18:37:06 +02:00
Maxime Kohlhaas
f5ab957faf FIX #13535 : state in italian address 2020-04-11 17:56:23 +02:00
simicar29
9573f1289a
FIX #7594
This is a temptative fix of the bad "multi page break" in expense report
2020-04-11 13:42:37 +02:00
Laurent Destailleur
3c9ca3860b
Merge pull request #13543 from atm-lena/11.0_FIX_hookmanager_typeAddReplace_completeTabsHead
FIX - Add function "completeTabsHead" to "addreplace" type hook.
2020-04-09 19:37:48 +02:00
Laurent Destailleur
c83f0f7484
Merge pull request #13533 from simicar29/11.0
11.0
2020-04-09 19:34:31 +02:00
Francis Appels
0a8a8bafa0 FIX print pictures in shipment docs 2020-04-09 15:40:36 +02:00
atm-lena
c9ab61b521 FIX - Add function "completeTabsHead" to hooks "addreplace" 2020-04-09 14:54:47 +02:00
stickler-ci
e402e35d96 Fixing style errors. 2020-04-08 14:09:04 +00:00
simicar29
6cb780d125
Avoid the doubledot issue in quoted-printable mail
When sending HTML mail using swiftmailer, the content will be encoded using quoted-printable. We may then encounter the "double dot" issue (doubled dot at the beginning of the line). This can be problematic with broken links to pictures for example.
This PR switches the encoding to base64.
2020-04-08 16:03:41 +02:00
Laurent Destailleur
0716951b6d Fix logo 2020-04-08 13:38:29 +02:00
Laurent Destailleur
ed4aa55857 Doxygen 2020-04-05 15:46:10 +02:00
Laurent Destailleur
47987f239d Fix trans 2020-04-05 15:42:39 +02:00
Laurent Destailleur
009cc36355 Fix sendocntext for builk action 2020-04-05 15:39:53 +02:00
Laurent Destailleur
e32ac7644d FIX Send email from bulk action of list of thirdparties 2020-04-05 15:31:18 +02:00
Laurent Destailleur
62387f712c FIX Send email from bulk action of list of thirdparties 2020-04-05 15:26:16 +02:00
Laurent Destailleur
bfbc9b303a Fix phpcs 2020-04-05 12:23:16 +02:00
Laurent Destailleur
13b47774e2 FIX #13424 2020-04-05 11:55:43 +02:00
Laurent Destailleur
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
2020-04-05 02:54:41 +02:00
Laurent Destailleur
a41f54c82f Fix css 2020-04-05 02:39:40 +02:00
Laurent Destailleur
a13287e285 Fix: validate of object is ok even if some fields are missing 2020-04-03 14:56:15 +02:00
atm-lena
bc0d98b91c FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation 2020-04-03 14:24:59 +02:00
Laurent Destailleur
f7b6895dc6 Fix option to not generate doc in modulebuilder. 2020-04-03 14:02:37 +02:00
Laurent Destailleur
7ad67ff91d
Merge pull request #13462 from atm-florian/11.0
fix advtargetemailing : fatal call to static attribut (table_element is not a static attribut)
2020-04-02 13:05:12 +02:00
Laurent Destailleur
70706d9ea7 FIX Missing token and take into account max date when it can. 2020-04-01 18:48:45 +02:00
florian HENRY
5658d783d6 fix advtargetemailing : fatal call to static attribut (that is not static: table_element) 2020-03-31 12:04:34 +02:00
Laurent Destailleur
9fcbec9f02 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:36:07 +02:00
Francis Appels
3eda785ca5 Add newline end of file 2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab Add token functions to improve modulebuilder compatiblity with maintained versions. 2020-03-30 10:28:20 +02:00
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
2020-03-30 10:24:42 +02:00
Laurent Destailleur
9379f6fa9d Fix duplicate tooltip 2020-03-26 20:27:49 +01:00
Laurent Destailleur
4a012c13b2 FIX Translation of tooltips of extrafields 2020-03-26 19:47:28 +01:00
Laurent Destailleur
ab19bb2455 FIX default value of selectMasssAction broken 2020-03-26 01:25:05 +01:00
Laurent Destailleur
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Laurent Destailleur
925554d15e More accurate result 2020-03-25 18:27:53 +01:00
VESSILLER
c516a54f78 FIX get remain to pay with rounding decimals 2020-03-25 11:53:47 +01:00
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +01:00
Laurent Destailleur
bcf17c79ef FIX closing tags 2020-03-22 02:44:00 +01:00
Laurent Destailleur
4ce1665a15 Fix charset in RSS export 2020-03-21 17:36:07 +01:00
Laurent Destailleur
c71da5d013 FIX mass action on stock movements 2020-03-19 15:43:06 +01:00
Laurent Destailleur
7eb4522636 FIX missing token and save of survey description 2020-03-19 11:59:57 +01:00
Laurent Destailleur
8e1ffa5144 Fix management of token 2020-03-19 10:52:07 +01:00
Laurent Destailleur
d38c6616e6 Doc 2020-03-19 09:53:20 +01:00
Laurent Destailleur
a3328c5ef3 Fix div 2020-03-18 18:37:44 +01:00
Laurent Destailleur
cc93a40c45 Fix label of local tax 2020-03-18 14:06:15 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
09359b8025
Merge pull request #13338 from altatof/box_shipments
FIX : missing class declaration
2020-03-12 17:06:50 +01:00
altairis
6618205e6f fix missing class declaration 2020-03-12 15:05:32 +01:00
simicar29
4f4b778c8c
update_price: add invoice_supplier element name
'invoice_supplier' as an element name was missing in test conditions to skip the update_price function
2020-03-12 12:53:17 +01:00
Laurent Destailleur
ad22820872 FIX #13313 2020-03-12 12:15:44 +01:00
Laurent Destailleur
4903287204 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
2020-03-11 17:04:28 +01:00
Laurent Destailleur
7e574e0429 Fix permissions 2020-03-11 16:47:42 +01:00
Laurent Destailleur
ae5d94b01c
Merge pull request #13323 from aspangaro/11.0_p5
Fix accounting files link on auguria menu
2020-03-11 16:43:10 +01:00
Laurent Destailleur
13ffc186b7
Merge pull request #13324 from atm-florianm/FIX_10.0_status_column_empty_in_invoices_box_when_using_MAIN_STATUS_USES_CSS
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
2020-03-11 16:41:24 +01:00
Laurent Destailleur
8808b7df87
Merge pull request #13325 from atm-florianm/FIX_10.0_load_langs_in_box_commandes
FIX 10.0 - missing translations for "orders" homepage "orders" box
2020-03-11 16:39:43 +01:00
Laurent Destailleur
25eae4db9c Fix missing __USER_EMAIL__ substitution 2020-03-11 16:28:00 +01:00
Laurent Destailleur
2b8a06cb5e FIX unit price for selected supplier products not set. NaN was used. 2020-03-11 16:12:34 +01:00
Florian Mortgat
ce01cf278d FIX 10.0 - translations for "orders" not loaded in the homepage box 2020-03-11 11:45:57 +01:00
Florian Mortgat
6d1f62c1d9 FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS 2020-03-11 11:03:19 +01:00
Alexandre SPANGARO
f2b33c0d77 Fix accounting files link on auguria menu 2020-03-11 06:20:25 +01:00
Laurent Destailleur
1f5c8f682c FIX cols parameter not propagated to tpl 2020-03-10 21:55:29 +01:00
Laurent Destailleur
99b1c773a7 FIX link when using anchor on "/" 2020-03-09 18:56:52 +01:00
Laurent Destailleur
1fb6d1d43d FIX menu export document was not visible when using "simple accounting" 2020-03-08 20:49:50 +01:00
Jean Traullé
7c2bed2846 Fix #13296 2020-03-06 16:22:41 +00:00
Laurent Destailleur
d4b67a6cef Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contrat/list.php
	htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
Laurent Destailleur
5ff4b638a5 FIX empty of series in graph of product distribution 2020-03-06 12:00:40 +01:00
Laurent Destailleur
e8407e3f0b
Merge pull request #13283 from OPEN-DSI/10.0
FIX substitute lines dates values on doc generator (ODT, ...)
2020-03-06 09:19:50 +01:00
kamel
0123fa7696 FIX subsitute lines dates values on doc generator (ODT, ...) 2020-03-05 15:37:01 +01:00