Commit Graph

82696 Commits

Author SHA1 Message Date
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28:41 +01:00
Laurent Destailleur
5553bae3a1 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:44:01 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
a371647bca FIX picto on shipment to reset qty to 0. Some quantities were not reset. 2021-03-04 08:52:55 +01:00
Laurent Destailleur
31845e1dae Fix phpcs 2021-03-04 00:04:43 +01:00
Laurent Destailleur
6503c81f47 FIX #16530 2021-03-03 23:55:28 +01:00
Laurent Destailleur
30dd4ac6ec FIX #16530 2021-03-03 22:52:02 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Laurent Destailleur
71370bd558 Fix links in cheque receipt pages 2021-03-03 21:18:14 +01:00
Laurent Destailleur
da8b67da83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-03 12:07:42 +01:00
Laurent Destailleur
093eab188e Code comment 2021-03-03 12:02:57 +01:00
Laurent Destailleur
6fcec3e99b
Merge pull request #16522 from FHenry/13.0
fix: warning on install
2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c
Update functions.lib.php 2021-03-02 23:57:37 +01:00
Florian HENRY
4e5849e50b remove debug 2021-03-02 23:13:05 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1 fix warning 2021-03-02 22:55:43 +01:00
Laurent Destailleur
8fc89b9ef1
Merge pull request #16511 from FHenry/13.0
fix #16510 (missing ($this->) in previous PR
2021-03-02 15:49:13 +01:00
Florian HENRY
373d52a562 Merge remote-tracking branch 'origin/13.0' into 13.0 2021-03-02 15:33:38 +01:00
Laurent Destailleur
a82ad6a02c Fix phpcs 2021-03-02 15:29:27 +01:00
Florian HENRY
2c163b8163 fix #16510 2021-03-02 15:22:22 +01:00
Laurent Destailleur
495c61c231 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-03-02 15:12:41 +01:00
Laurent Destailleur
5fd341bbd3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2021-03-02 15:11:18 +01:00
Laurent Destailleur
1f25f2bb7e Fix phpcs 2021-03-02 15:09:29 +01:00
Laurent Destailleur
cdfb9254b3
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields
FIX : select list dependencies now work for ModuleBuilder sellist field
2021-03-02 14:51:53 +01:00
Laurent Destailleur
3982a36a3e
Update commonobject.class.php 2021-03-02 14:47:35 +01:00
Florian HENRY
27c354567a FIX : select list dependencies now work for ModuleBuilder sellist field 2021-03-02 14:06:11 +01:00
Laurent Destailleur
1132ed306c
Merge pull request #16506 from andreubisquerra/patch-1
Avoid php errors if negative var in Receipt Module
2021-03-02 12:50:57 +01:00
Frédéric FRANCE
e1ff1c736c fix typo
Conflicts:
	htdocs/core/login/functions_openid.php
2021-03-02 12:41:34 +01:00
Laurent Destailleur
ef99b0f98c
Update modulebuilder.lib.php 2021-03-02 12:38:17 +01:00
stickler-ci
35cb48d649 Fixing style errors. 2021-03-02 11:37:46 +00:00
Laurent Destailleur
1d642f49f7
Update facture.class.php 2021-03-02 12:37:24 +01:00
Florian HENRY
593ae78761 avoid php wrning 2021-03-02 10:55:23 +01:00
Florian HENRY
d063533efb Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-03-02 09:46:05 +01:00
Florian HENRY
d7500b1609 fix php warning 2021-03-02 09:45:49 +01:00
Laurent Destailleur
23e8401e61 FIX #16296 2021-03-02 01:22:23 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
andreubisquerra
5bb7c521aa
Update dolreceiptprinter.class.php 2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775
Avoid php errors if negative var in Receipt Module
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
2021-03-01 23:09:07 +01:00
Laurent Destailleur
b8bd5cd0ee FIX Protection to avoid #16504 2021-03-01 23:08:03 +01:00
Laurent Destailleur
fb0eda446e Fix bad break 2021-03-01 22:00:48 +01:00
Laurent Destailleur
f64f53e460 Reduce errors 2021-03-01 21:57:45 +01:00
Laurent Destailleur
5b771eb798 Fix merge of 2 record. 2021-03-01 21:56:14 +01:00
Laurent Destailleur
6e61ae8e56 Fix responsive 2021-03-01 19:50:35 +01:00
stickler-ci
d20ba5a665 Fixing style errors. 2021-03-01 15:38:15 +00:00
Gauthier PC portable 024
861b583668 FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice 2021-03-01 16:34:42 +01:00
Juanjo Menent
96eb7a341a FIX: Bad project filter in ticket list 2021-03-01 16:14:38 +01:00
Laurent Destailleur
8a602ad143
Merge pull request #16493 from aspangaro/13p8
FIX: Various payment - Missing fields for check transmitter & bank name
2021-03-01 14:11:33 +01:00
Laurent Destailleur
b2cfc431bc
Merge pull request #16489 from aspangaro/13p7
FIX: Total_ht not show in contract link element
2021-03-01 14:07:29 +01:00
Laurent Destailleur
5cddd0465c Fix trans 2021-03-01 13:25:54 +01:00
Laurent Destailleur
81f1bee10c Fix option DONATION_USE_THIRDPARTIES 2021-03-01 11:18:14 +01:00
Laurent Destailleur
a68721c5b4 Fix missing translation 2021-03-01 10:58:06 +01:00
Laurent Destailleur
c80151717e Fix set of payment 2021-03-01 10:45:37 +01:00
Laurent Destailleur
0796bc45b1 Fix amount for some language on public payment page 2021-03-01 10:39:27 +01:00
Alexandre SPANGARO
0abe576fdc FIX: Various payment - Missing fields for check transmitter & bank name 2021-03-01 04:49:06 +01:00
Alexandre SPANGARO
3b1a9cd668 FIX: Total_ht not show in contract link element 2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Laurent Destailleur
77151bd560 Standardize tabs 2021-02-28 23:53:20 +01:00
Laurent Destailleur
bcdfdae10c FIX #16480 2021-02-28 23:43:07 +01:00
Laurent Destailleur
490faec547 FIX Timezone problems
Conflicts:
	htdocs/core/lib/date.lib.php
	test/phpunit/DateLibTest.php
2021-02-28 22:50:21 +01:00
Alexandre SPANGARO
de241eced3 FIX: Total_ht not show in contract link element 2021-02-28 22:22:20 +01:00
Laurent Destailleur
5406de13ee css 2021-02-28 21:33:13 +01:00
Laurent Destailleur
0a0c7fdeb1 FIX hourglass and hide button to pay 2021-02-28 21:15:40 +01:00
Laurent Destailleur
2a3b3753a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-28 13:27:38 +01:00
Laurent Destailleur
1149de1aca FIX #16485 2021-02-28 13:15:24 +01:00
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Laurent Destailleur
4cf2d2317f FIX Status in popup of member in widget 2021-02-27 19:16:14 +01:00
Frédéric FRANCE
8bfa7565bd
Update commonobject.class.php 2021-02-27 08:52:40 +01:00
Frédéric FRANCE
2cc635fd09
FIX https://github.com/Dolibarr/dolibarr/issues/16465 2021-02-27 08:00:02 +01:00
Laurent Destailleur
e7da1d7fe4 FIX #16431 2021-02-26 19:38:18 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Laurent Destailleur
5095e7f927
Merge pull request #16124 from hregis/fix_avoid_missing_url_and_token
Fix avoid missing url and token
2021-02-26 15:21:56 +01:00
Laurent Destailleur
9ebf5c2be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 12:48:08 +01:00
Laurent Destailleur
16906abc09 FIX File attachment on lots 2021-02-26 12:47:57 +01:00
Juanjo Menent
badd46e289 FIX: Bad project filter in ticket list 2021-02-26 11:53:23 +01:00
Laurent Destailleur
634d94b0b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 11:27:27 +01:00
Laurent Destailleur
0f44bdb90f Fix sql error 2021-02-26 11:27:03 +01:00
Laurent Destailleur
adc0313543 Fix lang 2021-02-26 11:09:15 +01:00
Laurent Destailleur
65195af778
Merge pull request #16448 from daraelmin/patch-1
Fix #16420 - V13.0.1 - undefined $model_mail_selected_id
2021-02-26 10:32:06 +01:00
Laurent Destailleur
e0785ac5ef
Update html.formmail.class.php 2021-02-26 10:31:02 +01:00
Laurent Destailleur
69c974800c
Update html.formmail.class.php 2021-02-26 10:30:30 +01:00
Laurent Destailleur
d1e530e108 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 10:28:05 +01:00
Laurent Destailleur
1a521bcc99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/class/contact.class.php
2021-02-26 10:27:55 +01:00
Laurent Destailleur
5c0fba26e2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-26 10:25:55 +01:00
Laurent Destailleur
549136efeb Removed useless log 2021-02-26 10:25:30 +01:00
Laurent Destailleur
99a17cadb7 Fix sql syntax 2021-02-26 10:25:08 +01:00
Laurent Destailleur
8e8efce7d1 Fix sql syntax 2021-02-26 10:23:53 +01:00
Laurent Destailleur
9db211b1a7
Merge pull request #16433 from ATM-Consulting/fix/11.0_contact_updateRoles_sql_injection_of_socid
FIX 11.0 - $this->socid injected in query without checking for empty string
2021-02-26 10:22:50 +01:00
daraelmin
5d31a93bf0
Fix #16420 - undefined $model_mail_selected_id
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:20:51 +01:00
Juanjo Menent
e08bfab537 FIX: Bad project filter in ticket list 2021-02-25 16:29:26 +01:00
Florian Mortgat
d59ee06438 FIX 11.0 - $this->socid injected in query without checking for empty value 2021-02-25 14:51:57 +01:00
Regis Houssin
0a3d1ab92e FIX use var "saved_url" instead global var "$url" 2021-02-23 16:56:45 +01:00
Regis Houssin
ec5d9983e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into
fix_avoid_missing_url_and_token

Conflicts:
	htdocs/core/js/lib_head.js.php
2021-02-23 16:55:32 +01:00
Laurent Destailleur
b7e2c7d87a FIX #16393 Do not sanitize <!DOCTYPE html> 2021-02-23 12:58:43 +01:00
Laurent Destailleur
d2e1f9fce9 FIX #16096 #16085 Any call of ajax pages must provide the token 2021-02-23 11:13:57 +01:00
Regis Houssin
77cecf58ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 11:10:32 +01:00