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

83224 Commits

Author SHA1 Message Date
Laurent Destailleur
174c6f8a45
Update mouvementstock.class.php 2021-06-04 10:33:13 +02:00
Laurent Destailleur
47eb2471f1
Merge pull request #17779 from OGPayet/fix/addMissingHooksInSocieteList 
add missing hooks in societe list.php
 2021-06-04 10:10:54 +02:00
Laurent Destailleur
9b0605f979 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-04 09:41:35 +02:00
Laurent Destailleur
164fe9fb4a
Merge pull request #17786 from FHenry/12_fix_ordersupplierstats 
FIX: order supplier stats by category now display figures
 2021-06-04 09:39:17 +02:00
Laurent Destailleur
935ba6ae18
Merge pull request #17796 from atm-john/13.0_fix_warehouse_id 
FIX  Warehouse id
 2021-06-04 09:09:18 +02:00
Laurent Destailleur
d79be7615c
Merge pull request #17799 from atm-john/13.0_fix_wrong_context 
FIX : wrong hook context
 2021-06-04 09:07:02 +02:00
Laurent Destailleur
5e0eef68d0
Merge pull request #17809 from atm-gauthier/fix_status_holiday_list 
FIX : field name is search_status and not search_statut
 2021-06-04 08:59:07 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm 2021-06-03 14:36:47 +02:00
Gauthier PC portable 024
093705a1b5 FIX : field name is search_status and not search_statut 2021-06-03 11:32:41 +02:00
ATM john
38423ba260 Fix wrong hook context 2021-06-02 16:31:31 +02:00
Laurent Destailleur
1468761073 Fix select 2021-06-02 16:29:38 +02:00
ATM john
3aca9bdb9e Fix warehouse id 2021-06-02 12:02:27 +02:00
Quentin VIAL-GOUTEYRON
b8b30a9af6 wrong where cabyprodserv 2021-06-02 10:53:04 +02:00
Quentin VIAL-GOUTEYRON
89f6b66c2a wrong join, request too long 2021-06-02 10:32:30 +02:00
atm-greg
f875bcfe09 update ->nom field if different from ->name 2021-06-02 10:30:48 +02:00
Laurent Destailleur
33a4c98dc3 Fix popup 2021-06-02 04:34:10 +02:00
Laurent Destailleur
5a260865dc FIX Creation of reception (missing extrafields). Lose data if error. 
Conflicts:
	htdocs/reception/card.php
 2021-06-02 04:23:19 +02:00
Florian HENRY
c91b9d613a FIX: order supplier stats by category now display figures 2021-06-01 15:30:17 +02:00
Pierre Payet
90ae16372c add missing hooks in societe list.php 2021-05-31 12:11:16 +02:00
TuxGasy
e1de510c38 Do a strict comparison when check if stock is enough 2021-05-31 11:06:52 +02:00
Laurent Destailleur
ab4941a558 Fix not visible button when missing permission 2021-05-29 02:22:30 +02:00
Laurent Destailleur
81a94f5642 FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE 2021-05-28 18:04:45 +02:00
Florian HENRY
c4f7a8194c remove space 2021-05-28 10:32:53 +02:00
Florian HENRY
11bbd2ace3 fix: bad GETPOST test on payment module configuration 2021-05-28 10:31:54 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF 2021-05-27 00:02:01 +02:00
Laurent Destailleur
3187c096c3
Merge pull request #17731 from atm-adrien/FIX_add_parameters_for_user_DoActions_hook 
FIX : Add parameters (object and action) for user list DoActions hook
 2021-05-26 17:48:42 +02:00
Adrien Raze
9c83bdff51 FIX : Add parameters (object and action) for user list DoActions hook 2021-05-26 17:02:34 +02:00
Laurent Destailleur
421681cda4 FIX Navigation in list of holiday 
Conflicts:
	htdocs/holiday/view_log.php
 2021-05-26 15:25:44 +02:00
Maxime Kohlhaas
b3a6bcd34f Fix Winfic accountancy export for due date 2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19 Fix Quadra accountancy export for due date 2021-05-26 14:59:28 +02:00
Laurent Destailleur
9b2fb74dca
Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note 
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
 2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php 2021-05-25 21:39:50 +02:00
Laurent Destailleur
2ac9099e7d
Merge pull request #17618 from piernov/12.0-fix-addUserToGroupLDAP 
Fix add/del user to group modifies LDAP group
 2021-05-25 21:23:17 +02:00
Laurent Destailleur
98d60870d5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:46 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
307c5cb276
Merge pull request #17702 from r3dge/13.0 
bug fix : replacing orders by donations and setting required field to…
 2021-05-25 20:12:07 +02:00
Laurent Destailleur
0d31db0ba5
Update don.class.php 2021-05-25 20:11:46 +02:00
Laurent Destailleur
6d637bf1e1
Merge pull request #17707 from FHenry/12_fix_export_balance 
fix: export balance with double quote
 2021-05-25 19:36:57 +02:00
Laurent Destailleur
71b35ef0e5 Fix regression - can't reset parent company 2021-05-25 12:11:06 +02:00
piernov
60176f7f5e
Fix add/del user to group modifies LDAP group 
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
 2021-05-24 18:01:27 +02:00
Florian HENRY
7d223beae5 fix: export balance with doublequote 2021-05-24 12:51:58 +02:00
r3dge
647997af28 fixing error on date 2021-05-23 18:15:00 +02:00
r3dge
f81136231a fixing PUT request for donation update 2021-05-23 18:09:10 +02:00
TuxGasy
2fdd8486c9 No try to translate label field in dictionary for new 2021-05-22 06:13:16 +02:00
r3dge
67cab8c1f2 bug fix : replacing orders by donations and setting required field to allow post action in rest API for url donations. See issue #17700 2021-05-21 16:01:04 +02:00
Laurent Destailleur
93501a1147 Fix phpcs 2021-05-20 15:25:56 +02:00
Laurent Destailleur
3359ae93d8
Merge pull request #17654 from atm-adrien/FIX_missing_hooks 
FIX : Missing hook in cibles.php (for mailing)
 2021-05-20 15:24:12 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
93558d5bbb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-05-20 14:58:57 +02:00
Laurent Destailleur
865ecf7a94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 14:58:50 +02:00
Laurent Destailleur
91f85abb7e Fix only comment to understand code are allowed 2021-05-20 14:55:37 +02:00
Laurent Destailleur
7a24d6399b
Merge pull request #17680 from SylvainLegrand/13.0 
avoid an infinite loop between a parent company and a branch when updating customer rates
 2021-05-20 14:54:28 +02:00
Laurent Destailleur
28487fac12
Create societe.class.php 2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf Fixing style errors. 2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358
Update societe.class.php 2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040
Update societe.class.php 2021-05-20 14:38:24 +02:00
Laurent Destailleur
5eeb7d474c
Merge pull request #17655 from ATM-Consulting/FIX_13.0_wrong_error_message_MAIN_DISABLE_ALL_MAILS 
FIX 13.0 - wrong error message for mail sending failure
 2021-05-20 14:33:40 +02:00
Laurent Destailleur
90443e26ac
Merge pull request #17660 from gmilad/gmilad-fix-17608-b11 
Fix issue #17608 for branch 11
 2021-05-20 14:30:30 +02:00
Laurent Destailleur
b71eb6b75e
Merge pull request #17668 from atm-john/13.0_fix_dirt 
FIX : Remove forgotten  echo
 2021-05-20 14:14:25 +02:00
Sylvain Legrand
70c85cfd72 Merge branch '13.0' of https://github.com/SylvainLegrand/dolibarr into 13.0 2021-05-19 19:09:27 +02:00
Sylvain Legrand
a3d1b49c65 Error in list when using alias name of thirdparty 2021-05-19 19:08:58 +02:00
stickler-ci
b5ac78d9a0 Fixing style errors. 2021-05-19 16:56:52 +00:00
Sylvain Legrand
8a9c21c642 Update societe.class.php 2021-05-19 18:47:07 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
ATM john
3bf71d456d fix doc 2021-05-19 12:01:47 +02:00
ATM john
1512abf96a Remove hpcs:disable 2021-05-19 12:00:27 +02:00
ATM john
9219dcfecb Fix price log spam 2021-05-19 11:52:34 +02:00
ATM john
5fd02992c0 Remove forgotten echo 2021-05-19 10:26:04 +02:00
gmilad
4bb18db905
Fix issue #17608 for branch 11 
Fix issue #17608 for branch 11
 2021-05-18 19:53:35 +02:00
gmilad
57732d4265
Fix issue #17608 for branch 10 
Fix issue #17608 for branch 10
 2021-05-18 19:45:15 +02:00
Florian Mortgat
6cccd77508 FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance) 2021-05-18 17:57:23 +02:00
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +02:00
Laurent Destailleur
0c4884bb2c Fix sql error 2021-05-18 12:44:56 +02:00
Laurent Destailleur
23514c957c
Merge pull request #17641 from WimpyMan/fix_sql_projects 
html.form.class.php: Fixed SQL error (projects)
 2021-05-18 12:36:18 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php 2021-05-18 12:35:30 +02:00
Laurent Destailleur
6d34c34cb5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:11:33 +02:00
Laurent Destailleur
6b12dd4143 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-18 12:02:52 +02:00
Laurent Destailleur
6170b28c3b FIx #17651 2021-05-18 11:58:49 +02:00
Laurent Destailleur
d3ece31969 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/user/class/api_users.class.php
 2021-05-17 19:29:03 +02:00
Laurent Destailleur
df2297bca3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/api_users.class.php
 2021-05-17 19:21:58 +02:00
Laurent Destailleur
a865f49d72 Fix phpcs 2021-05-17 19:19:26 +02:00
Bastien Schils
1a38d075a6 html.form.class.php: Fixed SQL error (projects) 
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
 2021-05-17 18:35:50 +02:00
Laurent Destailleur
c54e010126 Fix perms on API user 2021-05-17 16:16:45 +02:00
Florian HENRY
6f3d19b7b6 dol_concatdesc better than concat operator 2021-05-17 15:12:25 +02:00
stickler-ci
a3aba28c95 Fixing style errors. 2021-05-17 10:06:41 +00:00
Dorian Vabre
547f1dd370 Fix: user rest api rights 2021-05-17 11:54:53 +02:00
Florian HENRY
f95bd2f439 fixw that 2021-05-17 11:40:36 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Ferran Marcet
f923c70f38 Fix: Before there was no mistake 2021-05-17 10:17:54 +02:00
Laurent Destailleur
fd6147578a
Merge pull request #17611 from atm-maxime/fix/supplier_discount_replenish 
Fix use supplier relative discount in replenish order creation
 2021-05-17 09:44:39 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f FIX #17602 2021-05-17 09:25:18 +02:00
Laurent Destailleur
88d1ce7e49 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 09:19:39 +02:00
Laurent Destailleur
af2f40cc18 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 09:15:21 +02:00
Laurent Destailleur
592cfb5e93
Merge pull request #17602 from fmarcet/11.0 
FIX: Impossible to add multiple localtax2
 2021-05-17 09:13:58 +02:00
Laurent Destailleur
77bcd7ecff
Merge pull request #17628 from atm-maxime/fix/ticket3 
Fix missing substitutionarray on ticket presend
 2021-05-17 08:01:21 +02:00
Laurent Destailleur
d4162f3076
Update card.php 2021-05-17 08:00:33 +02:00
stickler-ci
bdf876ead4 Fixing style errors. 2021-05-17 05:38:46 +00:00
Laurent Destailleur
dd88f9cd76
Update card.php 2021-05-17 07:37:01 +02:00
Laurent Destailleur
c36f231f41
Update card.php 2021-05-17 07:34:56 +02:00
Laurent Destailleur
ea78462167 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 07:33:37 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId 
Fix: properly set gid for Group LDAP synchro
 2021-05-17 07:14:25 +02:00
Maxime Kohlhaas
1fbd53993f Fix missing substitutionarray on ticket presend 2021-05-16 19:07:36 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php 2021-05-16 11:33:07 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro 
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
 2021-05-15 18:01:34 +02:00
Maxime Kohlhaas
db32f882e8 Fix use of DatePropal instead of Date 2021-05-15 07:45:04 +02:00
Maxime Kohlhaas
acadef72c1 Fix use supplier relative discount in replenish order creation 2021-05-14 18:01:22 +02:00
stickler-ci
50d4d28c14 Fixing style errors. 2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a FIX: Filter of the dates in the lists is lost 2021-05-14 13:50:12 +02:00
Ferran Marcet
c577d1c51e FIX: Impossible to add multiple localtax2 2021-05-13 13:35:28 +02:00
Quentin VIAL-GOUTEYRON
56d78cf12a FIX missing town and zip filter in contract list sql request 2021-05-12 11:02:27 +02:00
Laurent Destailleur
8971fde420 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6 FIX rss module on servers with allow_url_fopen=0 2021-05-11 23:49:33 +02:00
Laurent Destailleur
4ec763a436
Merge pull request #17497 from Hystepik/develop_v13#2 
Fix #17491 : date extrafield filter works well now
 2021-05-11 21:15:50 +02:00
Laurent Destailleur
d576e56129
Merge pull request #17526 from daraelmin/daraelmin-V13-DarkMode-1 
Fix #17114 dark display for enabled module in dark mode
 2021-05-11 20:44:24 +02:00
Laurent Destailleur
c0689b3884 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
Laurent Destailleur
8dc1e1cb33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-11 20:17:24 +02:00
Laurent Destailleur
3683461c40 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	.travis.yml
	htdocs/societe/consumption.php
 2021-05-11 20:17:15 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete 
bug fix - deletion of invoice supplier payment
 2021-05-11 19:27:05 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity 
add entity check on verif_dispo mod_codeclient_elephant
 2021-05-11 19:13:17 +02:00
Laurent Destailleur
ce8d6c77ed
Merge pull request #17565 from ksar-ksar/patch-4 
FIX #13955
 2021-05-11 18:09:14 +02:00
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +02:00
Laurent Destailleur
837c828b1d Prepare 13.0.3 2021-05-10 21:06:48 +02:00
ksar
107374748e
FIX #13955 2021-05-10 15:42:24 +02:00
lmarcouiller
d293be56ce Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2 2021-05-10 10:41:56 +02:00
John BOTELLA
2fda3b1b46
FIX ; var case 
On this page $datePrint is not used but $dateprint yes
 2021-05-08 13:53:20 +02:00
Alexis LAURIER
e4a430f638 add entity check on verif_dispo mod_codeclient_elephant 2021-05-08 10:24:08 +02:00
Alexis LAURIER
d04c741a3b add payment_fourn delete proper check into security.lib 2021-05-08 09:12:17 +02:00
Laurent Destailleur
907ea1a8bd Fix sql error 2021-05-07 18:21:11 +02:00
Laurent Destailleur
97ca6895d8 Missing profid1 and 2 in get API 2021-05-07 15:50:07 +02:00
Laurent Destailleur
1cf46f9ae9 cast int 2021-05-07 15:11:28 +02:00
daraelmin
cb793cb762
Fix #17114 dark display for enabled module in dark mode 2021-05-07 13:19:02 +02:00
daraelmin
078f586299
@daraelmin Add enabled module color in var 2021-05-07 13:15:22 +02:00
stickler-ci
d108496c67 Fixing style errors. 2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3 Fix #17491 : Update of fix date extrafield filter 2021-05-07 09:47:15 +02:00
lmarcouiller
5dcdb06e91 Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2 2021-05-07 09:46:37 +02:00
Laurent Destailleur
3090c124f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Laurent Destailleur
a26d00428e
Merge pull request #17444 from Hystepik/develop_v13#1 
Fix #17361 : change of llx_export_model type to varchar(64)
 2021-05-06 16:48:46 +02:00
Laurent Destailleur
824a601014
Merge pull request #17507 from atm-john/11.0_fix_search_accent_in_description 
FIX : search accented words in product description (consumption page)
 2021-05-06 16:45:21 +02:00
Laurent Destailleur
0dbd68564c
Merge pull request #17493 from FHenry/13_fix_bank_url_merge_account 
FIX: merge thirparty also work for bank URL entry
 2021-05-06 16:39:13 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php 2021-05-06 16:38:34 +02:00
Laurent Destailleur
9ce23ac6b2
Merge pull request #17494 from atm-john/fix_not_enabled_email_template 
FIX saving template email
 2021-05-06 16:22:19 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0 
fix missing token
 2021-05-06 15:57:45 +02:00
ATM john
63292255cc Fix search accented words in product description 2021-05-05 18:45:23 +02:00
Florian HENRY
adc8620506 fix: allow webdavs link type 2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7 fix missing token 2021-05-05 17:05:51 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
lmarcouiller
209682e710 Fix #17361 : changes into mysql/tables of export_model 2021-05-05 11:30:13 +02:00
stickler-ci
95be7e8a63 Fixing style errors. 2021-05-05 09:29:52 +00:00
lmarcouiller
b739e7ba22 Fix #17491 : date extrafield filter works well now 2021-05-05 11:26:15 +02:00
lmarcouiller
c1ac2ebc86 Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#1 2021-05-05 10:45:24 +02:00
Laurent Destailleur
f1929eb106 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-05 00:16:27 +02:00
Laurent Destailleur
3807804acc Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE 2021-05-05 00:15:52 +02:00
ATM john
6574e54a41 Fix saving template email 2021-05-04 18:09:13 +02:00
Florian HENRY
c4e0d8da42 FIX: merge thirparty also work for bank URL entry 2021-05-04 17:28:20 +02:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete 
FIX missing token on dolGetButtonAction for action delete
 2021-05-04 00:21:55 +02:00
Laurent Destailleur
17ea41660f
Merge pull request #17469 from indelog/fix_order_payreport 
Fix show table of pdf payments repports in file order
 2021-05-03 19:19:00 +02:00
Laurent Destailleur
bb5e1c59c7
Merge pull request #17478 from FHenry/13_fix_eventfromcontact 
FIX: create event from contact card preselect contact correctly
 2021-05-03 19:17:52 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
17cb441569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
b7816f3d96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-03 18:58:03 +02:00
Laurent Destailleur
2d7ecb8a44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/boxes/box_produits_alerte_stock.php
 2021-05-03 18:57:52 +02:00
Laurent Destailleur
1d2f8b09d9
Update releve.php 2021-05-03 18:55:25 +02:00
WimpyMan
706545081c FIX #17476 releve.php: Fix SQL statement 
Single quotes `'` should be uses instead of double quotes `"` for
string values.
 2021-05-03 18:29:53 +02:00
Florian HENRY
9278228e20 FIX: create event from contact card preselect contact correctly 2021-05-03 18:08:49 +02:00
Indelog
c18848c944 Fix: simplify code with dol_dir_list() 2021-05-03 17:17:44 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +02:00
Indelog
dba9b17275 Fix forgot payment filter on file name 2021-05-03 16:00:14 +02:00
Indelog
9727768192 Fix show table of pdf payments repports in file order 
Use scandir() rather opendir() and readdir() to get a sorted list of
files.
 2021-05-03 09:46:51 +02:00
lmarcouiller
ce677c4f27 Fix #17361 : change of llx_export_model type to varchar(64) 2021-04-30 14:50:18 +02:00
ATM john
6e4962bb39 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection 2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8 Fix checkbox multiselect pre-selected value from get/post 2021-04-30 12:20:43 +02:00
Laurent Destailleur
27e2c69e4e
Merge pull request #17439 from atm-lena/11.0_FIX_ShowContactSearch_SQLError 
FIX SQL Error show_contacts : socialnetworks
 2021-04-30 12:03:40 +02:00
Laurent Destailleur
0d4eaca3e8
Merge pull request #17426 from daraelmin/daraelmin-patch-v11 
Fix wrong alias in natural_search v11-v14
 2021-04-30 11:58:53 +02:00
Laurent Destailleur
08c85a88c8
Merge pull request #17437 from daraelmin/daraelmin-patch-v11-2 
Fix logical test always false V11 to v14
 2021-04-30 11:57:58 +02:00
Francis Appels
773b16928d only if no token 2021-04-30 11:15:01 +02:00
Francis Appels
05a96b3ee2 FIX missing token on dolGetButtonAction for action delete 2021-04-30 10:46:05 +02:00
stickler-ci
81b964db45 Fixing style errors. 2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321 FIX SQL Error show_contacts : socialnetworks 2021-04-30 10:04:21 +02:00
daraelmin
749aeeb233
Fix $objp->subscription =="yes" 2021-04-29 23:16:21 +02:00
daraelmin
4174ebd9c0
Fix subscription =="yes" 2021-04-29 23:11:51 +02:00
daraelmin
965eb2d639
Fix logical test always false 
subscription is an integer and is set to 0 or 1. So subscription is never equal to "yes"
 2021-04-29 22:57:39 +02:00
Florian HENRY
a7b093ed81 FIX: Espadon PDF shippment model with long public note now wroking 2021-04-29 11:34:09 +02:00
daraelmin
68415322ec
Fix v11 wrong alias in natural_search 2021-04-29 10:00:54 +02:00
Laurent Destailleur
5348f13a60 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-04-28 20:47:43 +02:00
Laurent Destailleur
95ecb95ff1 FIX dol_print_date for %a and %b with some timezone 2021-04-28 20:47:28 +02:00
Laurent Destailleur
6dcee425a1
Update card.php 2021-04-28 15:07:31 +02:00
Sylvain Legrand
18d2bef8f3
Error 500 on propal card when we change the deadline 
if we don't use the automatic generation for PDF documents (MAIN_DISABLE_PDF_AUTOUPDATE is set to 1) when we change the deadline on a proposal we get an error 500.
 2021-04-28 11:58:34 +02:00
Laurent Destailleur
0037da1a56 FIX selection of project for reception must use 
PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS
 2021-04-27 23:29:53 +02:00
Laurent Destailleur
0a871546ee
Merge pull request #17379 from atm-adrien/FIX_add_function_price2num_to_productAlertStock_box_12.0 
FIX : Add function price2num for rounding values in productAlertStock…
 2021-04-27 18:45:26 +02:00