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

17683 Commits

Author SHA1 Message Date
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency 
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
 2019-10-02 11:12:30 +02:00
Frédéric FRANCE
7872a93605 Update box_commandes.php 2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586 Update box_supplier_orders.php 2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514 Update box_prospect.php 2019-10-01 11:36:24 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
d2881eb85b FIX CSS 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
 2019-09-29 19:26:37 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
46e019642f Code comment 2019-09-27 17:51:22 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
Laurent Destailleur
c53be23122 FIX Filtering the HTTP Header "Accept-Language". 2019-09-24 13:54:52 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
Laurent Destailleur
8ac0383fa0 FIX Send email from expense report card. 
FIX Alias name is not into the email recipient label.
 2019-09-23 12:36:12 +02:00
Laurent Destailleur
345ac28c89 Fix js injection 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
 2019-09-18 14:21:02 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on 
FIX Export of leave request show the number of open days
 2019-09-17 13:17:25 +02:00
gauthier
2ac8bd4e16 FIX : If we share invoice, we need to see discount created from a deposit on each entity 2019-09-17 11:59:58 +02:00
Laurent Destailleur
76b3668368 FIX regression with option to hide picto on top menu 2019-09-15 15:15:59 +02:00
Laurent Destailleur
544a1237bc FIX regression with option to hide picto on top menu 2019-09-15 15:11:13 +02:00
TuxGasy
e0238705cc Check if childtablesoncascade is not empty 2019-09-14 19:04:43 +02:00
Laurent Destailleur
584549df11 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
florian HENRY
224b4c147a Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2019-09-13 15:25:25 +02:00
florian HENRY
7966bfc2df fix: fill id for links (document tab) 2019-09-13 15:25:16 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project 2019-09-12 21:39:57 +02:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Laurent Destailleur
48aedcee20 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55 FIX missing include (dol_convert_file not found) 2019-09-10 15:29:33 +02:00
Laurent Destailleur
08f8ad6f30 FIX javascript error when using dol_use_jmobile=1 2019-09-10 00:09:18 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
david
ac539d20b9 FIX #10460 compatibility with MariaDB 10.4 2019-09-09 11:10:08 +02:00
Laurent Destailleur
4e5b4964dc
Merge pull request #11827 from aspangaro/10.0_boxes_nowrap 
FIX Nowrap missing on amount in boxes
 2019-09-06 23:37:23 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +02:00
Laurent Destailleur
165f64463b Fix look and feel v10 2019-09-06 12:46:54 +02:00
Laurent Destailleur
5b1d94a668 Fix translation 2019-09-06 02:27:49 +02:00
Laurent Destailleur
08c16ea2e1 Fix bad dir created 2019-09-06 02:03:26 +02:00
Alexandre SPANGARO
4fe141c9f1 FIX Nowrap missing on amount in boxes 2019-09-05 12:05:50 +02:00
Laurent Destailleur
7d5877b8b1 Doxygen 2019-09-04 13:50:10 +02:00
Laurent Destailleur
0a17e6bfd5 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
 2019-09-03 22:39:24 +02:00
Laurent Destailleur
1a8f271bf4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-03 17:41:56 +02:00
Laurent Destailleur
3c80bc139e
Merge pull request #11794 from atm-florian/10_fixMissingSubstitutionCheckbox 
FIX bad substitution for extrafields type checkbox
 2019-09-03 15:18:17 +02:00
Laurent Destailleur
931380c740
Merge pull request #11803 from atm-florian/10_fixavoidDividedBy0 
fix avoid error message Divided By 0
 2019-09-03 12:58:56 +02:00
Laurent Destailleur
a126b1e538 FIX Add char $ and ; in sanitizing of filenames. 2019-09-02 22:25:44 +02:00
Laurent Destailleur
59fe34752c Fix error reporting of LDAP errors 2019-09-02 16:02:48 +02:00
florian HENRY
c8bfc7441e fix avoid error message Divided By 0 2019-09-02 09:44:59 +02:00
florian HENRY
7dc3684662 fix bad substitution for extrafields type checkbox 2019-09-02 09:41:30 +02:00
Laurent Destailleur
29d2e7edd0 missing reposition 2019-09-02 04:39:36 +02:00
Laurent Destailleur
a4600c9efa Fix missing class reposition 2019-09-01 23:24:29 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
Laurent Destailleur
6420a32395 Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:54:31 +02:00
Laurent Destailleur
641a50a58b Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:52:29 +02:00
Laurent Destailleur
85016a7a45 Fix bad error when module not enabled 2019-08-28 13:12:43 +02:00
Laurent Destailleur
c0262f1e19 Fix type integer 2019-08-28 12:24:56 +02:00
Laurent Destailleur
7236df37d4 FIX error management when adding a property with type real 2019-08-28 12:16:59 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Laurent Destailleur
e09223ed4d FIX #11702 2019-08-27 17:52:46 +02:00
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
9fb06b1e7e Fix phpcs 2019-08-27 11:42:18 +02:00
Laurent Destailleur
63dcef710e Fix phpcs 2019-08-27 03:41:02 +02:00
Laurent Destailleur
4fb36ce84d Fix phpcs 2019-08-27 03:22:58 +02:00
Laurent Destailleur
783c69c618
Merge pull request #11756 from ptibogxiv/patch-245 
Fix lang for "nature" in contact
 2019-08-26 22:51:23 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727 Fix add missing filter on entity on stock listing for product combo 2019-08-26 22:42:04 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
ptibogxiv
ad38478fc6
Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Laurent Destailleur
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
2b8c57b714
Merge pull request #11724 from ptibogxiv/patch-228 
Fix stripelive_oauthcallback.php
 2019-08-26 16:34:40 +02:00
Laurent Destailleur
039a613ea1
Merge pull request #11728 from ptibogxiv/patch-231 
Fix stripetest_oauthcallback.php
 2019-08-26 16:29:00 +02:00
Laurent Destailleur
0c8640bfd9 FIX #11752 2019-08-26 16:09:20 +02:00
Laurent Destailleur
60c3cefc53 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:44:39 +02:00
ptibogxiv
839ba76ae4
Update stripetest_oauthcallback.php 2019-08-23 08:58:08 +02:00
ptibogxiv
06fdd5ddbc
Update stripelive_oauthcallback.php 2019-08-22 22:50:41 +02:00
ptibogxiv
0be59646a8
Update stripelive_oauthcallback.php 2019-08-22 22:00:53 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
 2019-08-22 12:39:07 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224 
FIX for MAIN_MAXTABS_IN_CARD = $i card
 2019-08-22 11:25:08 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
 2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3 FIX too many record in sql request. Whena criteria is a filter, we must 
use an inner join.
 2019-08-18 23:59:24 +02:00
Laurent Destailleur
d8d927547f Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU 2019-08-18 19:09:53 +02:00
Laurent Destailleur
18eb2a83fe FIX #11671 CVE-2019-15062 2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00
Laurent Destailleur
898996da4a FIX vulenrability in uploading file found by 美创科技安全实验室 2019-08-16 21:45:13 +02:00
Laurent Destailleur
d51a651ab4 Fix phpcs 2019-08-16 17:35:12 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list 
Fix total on list and amount opened on thirdparty card (for supplier)
 2019-08-15 21:14:03 +02:00
Laurent Destailleur
12e6dabc43 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-15 20:41:56 +02:00
Laurent Destailleur
a8afb4549a
Merge pull request #11634 from fmarcet/9.0 
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
 2019-08-15 20:22:27 +02:00
Laurent Destailleur
38fc05866d
Merge pull request #11619 from simnandez/10.0 
Fix: allow access from any other class that inherits Form class.
 2019-08-15 19:48:41 +02:00
Laurent Destailleur
c131af5ae1 FIX #11672 2019-08-15 19:16:52 +02:00
Laurent Destailleur
9cb5ba35dd
Merge pull request #11681 from hregis/10.0_mc 
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
 2019-08-15 19:08:42 +02:00
Laurent Destailleur
4534826583
Merge pull request #11633 from fmarcet/10.0 
FIX: Make protected all pfd models functions
 2019-08-15 19:04:32 +02:00
Laurent Destailleur
12bebdefbb Fix can replace PclZip with ZipArchive 2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091 FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 04:07:02 +02:00
Laurent Destailleur
6de2118f11 FIX Bad error management in zip compress and web site export 
Conflicts:
	htdocs/website/index.php
 2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7 FIX Missing some replacements in website module 
Conflicts:
	htdocs/website/index.php
 2019-08-14 04:02:57 +02:00
ptibogxiv
93d64bb84e
Update functions.lib.php 2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64
FIX for MAIN_MAXTABS_IN_CARD = $i card 2019-08-13 17:47:30 +02:00
Regis Houssin
34579dd4db FIX phpcs 2019-08-13 07:46:03 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and 
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
 2019-08-13 06:43:28 +02:00
Laurent Destailleur
8e0a023270 FIX Disabling a website does not put it offline 2019-08-13 05:05:19 +02:00
Lenin Rivas
5c1a84746c
Add Linked objects Fichinter Ref. in PDF formats 2019-08-12 15:21:41 -05:00
Laurent Destailleur
5346135a0c Fix removed duplicate load 2019-08-12 17:12:57 +02:00
Laurent Destailleur
446f0590dc FIX VAT number for Monaco (it uses FR) 2019-08-12 13:45:04 +02:00
Ferran Marcet
f1c0442a77 FIX: Add comment before protected functions 2019-08-12 10:16:04 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-10 01:43:52 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
Ferran Marcet
32220dde2e FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES 2019-08-05 14:12:19 +02:00
Ferran Marcet
fd1204bcd2 FIX: Make protected all pfd models functions 2019-08-05 13:41:25 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
Laurent Destailleur
25ee539f92 FIX Missing where on entity 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-08-03 16:35:15 +02:00
Laurent Destailleur
55e9335cd2 Fix code comment 2019-08-02 19:26:04 +02:00
Laurent Destailleur
c34739ab3f Fix A file for a hidden feature provides a service without security 
checks.
 2019-08-02 19:25:50 +02:00
Juanjo Menent
03a2377abc Fix: allow access from any other class that inherits Form class. 2019-08-02 12:31:24 +02:00
Laurent Destailleur
c01ac05aec FIX Content of email for subscription 2019-08-02 12:04:06 +02:00
Laurent Destailleur
cd0d5c41f5
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-08-01 16:37:40 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-01 16:27:55 +02:00
Laurent Destailleur
bf14b4b3d5 Add Canada Dollar in currency that need symbol before 2019-08-01 16:20:18 +02:00
Laurent Destailleur
d6ae62478c FIX #10984 FIX reposition on "Build backup" button 
FIX Fatal error on dol_htmloutput_mesg with corrupted array
 2019-08-01 15:42:44 +02:00
Laurent Destailleur
90ddc0a214 FIX #10930 2019-08-01 14:27:57 +02:00
Laurent Destailleur
a260e7391f FIX for #11232 2019-08-01 14:24:54 +02:00
Laurent Destailleur
12b530c418 FIX Setup of TakePos was not possible after a clean install 2019-08-01 11:27:35 +02:00
atm-arnaud
f64092a1e8 FIX order or proposals billed if both workflow conf activated 2019-08-01 11:00:49 +02:00
Laurent Destailleur
9baf21f492 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 22:03:13 +02:00
Laurent Destailleur
754ed1b93b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-07-30 22:03:02 +02:00
Laurent Destailleur
6b789a13a1
Merge pull request #11562 from atm-quentin/FIX_pdf_cheque 
FIX name was able to be in field but went back to new line
 2019-07-30 22:00:58 +02:00
Laurent Destailleur
ed7a57e3ef
Merge pull request #11571 from atm-john/9.0_fix_showOutputField 
Fix sellist showOuputField
 2019-07-30 21:40:37 +02:00
Laurent Destailleur
9a87e27176
Merge pull request #11566 from atm-florianm/FIX_workflow_amount_comparison_fails_due_to_floating_point_val_precision_arithmetic_drift 
FIX: floating point precision errors in the triggers of the workflow module
 2019-07-30 21:23:43 +02:00
Laurent Destailleur
fe8ced58c8
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-07-30 21:19:33 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Vaadasch
23bca6f4cd Change "DOCUMENT_URI" to "PHP_SELF" 
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
 2019-07-30 19:40:28 +02:00
Vaadasch
1600ecc9ec Change 0 and 1 to FALSE and TRUE for pgsql 
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
 2019-07-30 19:35:03 +02:00
Laurent Destailleur
e54c6fb5e2 FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 19:30:56 +02:00
Laurent Destailleur
a871aa818b FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 18:15:04 +02:00
Marc de Lima Lucio
703506c0e2 FIX: import filter error 2019-07-30 14:11:21 +02:00
Marc de Lima Lucio
449ef92007 FIX: categories import: prevent mismatch between category type and object type 2019-07-30 12:31:03 +02:00
Laurent Destailleur
f825711206 Code comment 2019-07-29 11:01:29 +02:00
Florian Mortgat
858e8a826f FIX: use rounding to compare the amounts 2019-07-29 09:47:28 +02:00
ATM john
581ae226ff Fix sellist showOuputField 2019-07-27 18:25:25 +02:00
Laurent Destailleur
1ca3c6e3ae Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:17:47 +02:00
atm-quentin
1f7cd1a3f8 FIX name was able to be in field but went back to new line 2019-07-26 11:05:16 +02:00
Laurent Destailleur
0b69bf9957 FIX #11553 2019-07-25 18:17:17 +02:00
Laurent Destailleur
0d79905b0a
Merge pull request #11539 from hregis/9.0_bug2 
FIX duplicate on the check (TODO field $onetrtd not used ?)
 2019-07-25 17:56:42 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00
Laurent Destailleur
8241bc414a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2019-07-25 17:52:17 +02:00
Laurent Destailleur
fe9ddd7649 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2019-07-25 17:50:07 +02:00
Laurent Destailleur
111c0dcadd Comment 2019-07-25 17:46:48 +02:00
Florian Mortgat
65e9d8f239 FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined) 2019-07-25 11:14:59 +02:00
Laurent Destailleur
151075402f css 2019-07-24 17:15:25 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
9ddb8a5b0b Fix tooltip to say closed project are not visibles 2019-07-23 14:41:29 +02:00
Laurent Destailleur
c96ad85126 Add hidden option to avoid experimental to use export files feature 2019-07-23 12:34:17 +02:00
atm-josselin
0a1f4b7931 FIX : correct error in files with multiple spaces 2019-07-23 09:45:17 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
5dcf4d6646 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-22 19:06:48 +02:00
Laurent Destailleur
b4e0c5ef6c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-22 18:51:32 +02:00
Regis Houssin
6409cc06ae FIX duplicate on the check (TODO field $onetrtd not used ?) 2019-07-22 11:44:56 +02:00
Laurent Destailleur
4f34a8b6e8 FIX Position was lost when we edit the line of template invoice 2019-07-21 16:15:13 +02:00
Laurent Destailleur
932530bd37 FIX ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on 2019-07-21 16:00:32 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Laurent Destailleur
9f9598ac99 FIX missing token 2019-07-20 11:44:54 +02:00
Laurent Destailleur
220f8300c1 FIX Responsive of public interface of ticket 2019-07-20 00:14:14 +02:00
Laurent Destailleur
de4142e23e FIX Add message from public interface 2019-07-19 23:57:35 +02:00
Laurent Destailleur
ec34ce1e64 Maxi debug of module ticket 2019-07-19 23:11:00 +02:00
Laurent Destailleur
48b4aa4c8d Fix link to ticket 2019-07-19 18:29:33 +02:00
Laurent Destailleur
73af3542d1 FIX the feature to bill time spent was not enabled. 2019-07-19 16:18:14 +02:00
Florian Mortgat
b100cdb9db FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set. 2019-07-19 11:58:21 +02:00
Laurent Destailleur
6c3a30e872 Fix log 2019-07-19 03:05:55 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
5e204f0f67 Merge 2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Christophe Battarel
aab23a1531 FIX : do not return formatted prices in json string 2019-07-16 17:50:43 +02:00
Laurent Destailleur
f44182c89f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-16 00:13:52 +02:00
Laurent Destailleur
5d74c81941 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-15 23:48:40 +02:00
Laurent Destailleur
d694360c66 Fix warning 2019-07-15 23:46:54 +02:00
Regis Houssin
294bc5dcb5 FIX avoid conflict with "$classname" in card.php 2019-07-15 10:19:06 +02:00
Laurent Destailleur
e1d4917704 FIX Missing field "Conciliated" into bank transaction export 2019-07-14 00:39:42 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-07-14 00:13:16 +02:00
Laurent Destailleur
b66ad24d85 Fix save of doc template for recuring invoices. 2019-07-14 00:10:15 +02:00
Laurent Destailleur
5ccb397af9
Merge pull request #11473 from hregis/9.0_security 
FIX better compatibility with multicompany transverse mode
 2019-07-13 23:42:36 +03:00
Laurent Destailleur
4dabdfa5ac
Merge pull request #11483 from inoveaconseil/FIX_update_price 
FIX element name in update_price
 2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e
Update commonobject.class.php 2019-07-13 22:29:50 +02:00
Laurent Destailleur
b1e21ed5fc FIX Computed field were not calculated into lists. 2019-07-11 22:18:44 +02:00
Nicolas ZABOURI
abd0abf115 FIX element name in update_price 2019-07-10 18:36:12 +02:00
atm-lena
a3f5397988 FIX help text 2 2019-07-10 15:55:50 +02:00
atm-lena
cebf81a514 FIX helpp text 2019-07-10 15:18:25 +02:00
Regis Houssin
41b004c2b8 FIX better compatibility with multicompany transverse mode 2019-07-10 12:16:32 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +02:00
Laurent Destailleur
fb8c93a69d FIX Bad sql request 2019-07-04 16:00:14 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
8b0b824471 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-04 12:22:48 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/action/card.php
 2019-07-04 12:22:40 +02:00
Laurent Destailleur
63c93be94e
Update html.form.class.php 2019-07-04 12:20:34 +02:00
Laurent Destailleur
75aa11e526 Code comment 2019-07-04 02:02:44 +02:00
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
Laurent Destailleur
d9560dbb61 Fix var not initialized 2019-07-02 18:02:06 +02:00
Laurent Destailleur
3b0f1c733f Fix missing token 2019-07-02 15:00:17 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
e9c6a10bdd Fix phpcs 2019-06-29 18:35:36 +02:00
Laurent Destailleur
72084f4684 Fix protected 2019-06-29 16:49:32 +02:00
atm-quentin
49db277368 FIX ending slash 2019-06-26 16:42:14 +02:00
Laurent Destailleur
7a0962a393 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAccounting.class.php
 2019-06-25 23:13:55 +02:00
Laurent Destailleur
d5479cd9ae Fix import of ledger 2019-06-25 22:37:13 +02:00
Laurent Destailleur
20471c54e1 Fix import code (regex of data imported + import of constant) 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2019-06-25 22:27:00 +02:00
Laurent Destailleur
fc574946b1 Fix import of ledger 2019-06-25 22:23:51 +02:00
Laurent Destailleur
0ae0951d7d Fix import code (regex of data imported + import of constant) 2019-06-25 22:23:30 +02:00
Laurent Destailleur
70967b4ea1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd Fix purge of old files 2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb Fix we need to keep temp dir 2019-06-25 19:02:24 +02:00
Laurent Destailleur
171a173935 Fix phpcs 2019-06-25 14:30:48 +02:00
Laurent Destailleur
f984a77044 FIX Fallback on main language for alternative languages 2019-06-25 14:05:10 +02:00
Laurent Destailleur
700acbeefb Fix phpcs 2019-06-25 13:26:02 +02:00
Laurent Destailleur
2f7e9aa363 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
 2019-06-25 13:24:45 +02:00
Laurent Destailleur
736f918bac Fix phpcs 2019-06-25 13:14:11 +02:00
Laurent Destailleur
d85ec982e5 Fix do not output log in arhived log for draft documents 2019-06-24 23:39:44 +02:00
Laurent Destailleur
51506724ef FIX Do no record log in archived log for draft documents. 2019-06-24 23:36:52 +02:00
Laurent Destailleur
31ffa6bc69 FIX #11218 #11150 2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100 FIX #11218 #11150 2019-06-24 18:40:31 +02:00
Laurent Destailleur
ae1ad80994 Fix count 2019-06-24 16:32:42 +02:00
Laurent Destailleur
70f19b3a3d Fix counter of record 2019-06-24 16:31:56 +02:00
Laurent Destailleur
28024d5cd1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:28:48 +02:00
Laurent Destailleur
b98874848f Fix backport 9.0 2019-06-24 16:12:54 +02:00
Laurent Destailleur
84575df7e6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail 
FIX mass send mail
 2019-06-24 15:34:06 +02:00
Laurent Destailleur
7e10208619
Merge pull request #11380 from atm-florian/9.0 
fix depending extrafeilds list
 2019-06-24 15:23:48 +02:00
Laurent Destailleur
43fc0466e5 Fix position of modules 2019-06-23 20:05:15 +02:00
Laurent Destailleur
1c48b8be32 Fix code comment 2019-06-23 17:23:41 +02:00
Laurent Destailleur
8a9c858609 Code comment 2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
2854e0dae6 Code comment 2019-06-22 19:15:15 +02:00
Laurent Destailleur
662afe8a36 Fix missing global 2019-06-22 18:24:29 +02:00
Laurent Destailleur
a4cd7772ef Fix title 2019-06-22 12:02:41 +02:00
Laurent Destailleur
a7d7d44f87 FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
John Botella
ec7ebe9f39 redo backported fix and update adherent substitution methode 2019-06-21 15:32:38 +02:00
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +02:00
Laurent Destailleur
c63b465d48 Fix doxygen 2019-06-21 14:34:04 +02:00
Laurent Destailleur
4499447a89 Fix sort order of import profiles 
Fix picto in import profile for accounting
 2019-06-21 14:27:38 +02:00
Laurent Destailleur
f9095408b6 Fix sort order of export profiles 
Add missing pos information into export of invoice
Add missing label of project in export of invoice
 2019-06-21 13:25:40 +02:00
Laurent Destailleur
ad4bd05efb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:29:06 +02:00
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
Laurent Destailleur
ff0f6295d8 Fix phpcs 2019-06-20 13:59:53 +02:00
Laurent Destailleur
29e3199639 Fix phpcs 2019-06-20 13:39:29 +02:00
Laurent Destailleur
cb057e9c6d NEW Add hidden option to be ready for BREXIT 2019-06-20 12:32:14 +02:00
florian HENRY
0865bdb60f fix depending extrafeilds list 2019-06-20 12:16:48 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +02:00
Laurent Destailleur
ee8e7d66f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 03:43:27 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other 
Translate rights
 2019-06-20 03:36:16 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf 
FIX better method to check if pdf is protected/encrypted
 2019-06-20 03:22:51 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2 
Missing language key
 2019-06-20 03:02:13 +02:00
Laurent Destailleur
925314c710
Merge pull request #11367 from aspangaro/10.0_other3 
Nowrap on amount
 2019-06-20 02:51:14 +02:00
Laurent Destailleur
d6b6f77e74 Fix support domains with 3 levels 2019-06-19 22:06:12 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
Laurent Destailleur
04f2fb604f Fix duplicate 'option_' in prefix 2019-06-19 15:48:37 +02:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
9bde7c5229 Nowrap on amount 2019-06-19 09:21:18 +02:00
Alexandre SPANGARO
13836d3e21 Missing language ley 2019-06-19 06:21:53 +02:00
Alexandre SPANGARO
c59de49894 Translate rights 2019-06-18 22:38:52 +02:00
Laurent Destailleur
53923a8581 Fix scrutinizer warnings 2019-06-18 20:21:22 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first 
chars wrong.
 2019-06-18 19:41:16 +02:00
Laurent Destailleur
0123a18ff8 Look and feel v10 2019-06-17 18:44:08 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00
Eric Seigne
0b3bc5a172 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber 2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287 Debug page to export file 2019-06-17 17:20:22 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Laurent Destailleur
cf82587504 Fix menu entry 2019-06-17 15:02:44 +02:00
Laurent Destailleur
8330078de1 Fix default value 2019-06-17 12:33:09 +02:00
Regis Houssin
3afd4e15ad FIX try to remove ob_* functions 2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf 2019-06-17 07:08:35 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
Laurent Destailleur
122c4eb8bd
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction 
FIX empty test
 2019-06-14 13:51:34 +02:00
Laurent Destailleur
5cada6ee0b
Merge pull request #11336 from ptibogxiv/patch-186 
Fix measuring_units_string display function
 2019-06-14 13:48:31 +02:00
Laurent Destailleur
1fa1b91916
Update product.lib.php 2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db
Update product.lib.php 2019-06-14 13:38:52 +02:00
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00
ATM john
0ef9a8843a Fix empty test 2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf
Update product.lib.php 2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58
Fix measuring_units_string display function 2019-06-13 20:52:52 +02:00
Laurent Destailleur
7e1eacb7d5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-13 13:26:54 +02:00
Laurent Destailleur
357c5244f7 Fix phpcs 2019-06-13 13:26:35 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +02:00
Laurent Destailleur
52159dcb69 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:14:19 +02:00
Laurent Destailleur
3e6b7208cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:07:24 +02:00
Laurent Destailleur
4b26702516 code comment 2019-06-13 11:07:38 +02:00
Laurent Destailleur
60e1e89981
Merge pull request #11328 from fappels/clean_10_beta 
Fix scrutinizer bugs
 2019-06-13 10:18:59 +02:00
Laurent Destailleur
ab9742f4df
Try to keep proportion of logo 2019-06-13 10:09:20 +02:00
Laurent Destailleur
2bc821d900
Try to keep proportions of logo 2019-06-13 10:08:35 +02:00
Laurent Destailleur
1318e26cda
Merge pull request #11298 from hregis/7.0_price 
FIX missing compatibility with multicompany transverse mode
 2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63
Update html.formother.class.php 2019-06-13 09:59:10 +02:00
Francis Appels
3f63be6045 fix typo 2019-06-12 22:10:40 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00
Laurent Destailleur
e81663ec34 Fix cropping of image files for BOM module was ko 2019-06-12 19:00:34 +02:00
Laurent Destailleur
c57013f293 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:14 +02:00
Laurent Destailleur
4f5f03b893
Merge pull request #11326 from atm-greg/FIX_massaction_presend 
Fix massaction presend
 2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28
Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
 2019-06-12 12:03:46 +02:00
Laurent Destailleur
afe1ec633b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:21 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00
Laurent Destailleur
2ac8723ce9 Code comment 2019-06-11 21:02:41 +02:00
Maxime Kohlhaas
0ce2c2aab5 Fix missing massaction hook params 2019-06-10 10:11:26 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:58:58 +02:00
Laurent Destailleur
0a903da5dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:53:30 +02:00
Laurent Destailleur
b36f80ab2e
Merge pull request #11306 from frederic34/patch-6 
Parameter must be array or object that implements Countable
 2019-06-07 18:10:03 +02:00
Laurent Destailleur
b73d287953
Update agenda.lib.php 2019-06-07 18:09:43 +02:00
Laurent Destailleur
4c44378049 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 16:56:39 +02:00
Laurent Destailleur
0edd94c4f8
Merge pull request #11303 from atm-florian/10.0 
fix various little stuff from scrutinizer (undeclared vriable, misspelling variable, mistype declaration)
 2019-06-07 15:21:30 +02:00
Laurent Destailleur
4ed7e281c5
Merge pull request #11301 from frederic34/patch-5 
avoid warning with php 7.2
 2019-06-07 15:08:49 +02:00
Laurent Destailleur
a0a0c2207b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 01:29:55 +02:00
Laurent Destailleur
3d8910d327 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-06-06 19:19:05 +02:00
Laurent Destailleur
3ff154c1d0 Fix sql error 2019-06-06 19:05:47 +02:00
Frédéric FRANCE
f11db8396a
Parameter must be array or object that implements Countable 
warning with php 7.2
 2019-06-06 09:49:32 +02:00
florian HENRY
f2171d466b fix variable name 2019-06-05 17:05:26 +02:00