lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,584 Commits 43 Branches 150 Tags 886 MiB
856b010a45
Commit Graph

77817 Commits

Author SHA1 Message Date
Laurent Destailleur
f5be9b6244
Merge pull request #17859 from aspangaro/12p14 
FIX Missing link to language file
 2021-06-10 12:19:19 +02:00
Laurent Destailleur
9ed7a3a5c5
Merge pull request #17863 from marc-dll/11.0_FIX_holiday_massaction_delete_right 
FIX: holiday list: bad right for mass deletion
 2021-06-10 12:13:10 +02:00
Laurent Destailleur
729c12a8e4
Merge pull request #17864 from DorianVabre/FIX_11.0_CSMSFile_count 
Fix: using strlen() instead of count() to measure a message length on CSMSFile
 2021-06-10 12:12:43 +02:00
Alexandre SPANGARO
08186fdff1 Fix warning - search_societe is already present 2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60 FIX Customer invoice list - Pagination lost search_date_xxx information 2021-06-10 06:22:03 +02:00
lvessiller
c37c371392 FIX clone invoice with acount line 2021-06-09 17:18:01 +02:00
Dorian Vabre
0a23cf029d using strlen instead of count 2021-06-09 14:13:50 +02:00
Marc de Lima Lucio
5d9aa40065 FIX: holiday list: bad right for mass deletion 2021-06-09 12:40:34 +02:00
Gauthier PC portable 024
4b6fb7dd47 FIX : auto rounding on "_FORMATED_" tags 2021-06-09 12:26:28 +02:00
Alexandre SPANGARO
a4f3792cec FIX Missing link to language file 2021-06-09 07:42:05 +02:00
atm-greg
37433ffee7 verify vat change to update multiprice 2021-06-08 11:39:04 +02:00
Gauthier PC portable 024
e64c27e1c3 FIX : need to add payment sum to getlibstatus function in object linked block 2021-06-08 10:27:33 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
ptibogxiv
36accba5c9
Fix date_start of last subscription 2021-06-05 14:43:40 +02:00
Laurent Destailleur
d1d305e470
Merge pull request #17738 from frederic34/patch-11 
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
 2021-06-04 12:42:26 +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
atm-greg
f875bcfe09 update ->nom field if different from ->name 2021-06-02 10:30:48 +02:00
Florian HENRY
c91b9d613a FIX: order supplier stats by category now display figures 2021-06-01 15:30:17 +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
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
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
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
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
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
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
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +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
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +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
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
Laurent Destailleur
c54e010126 Fix perms on API user 2021-05-17 16:16:45 +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
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
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
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
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
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
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
atm-lena
8fb474c687 Add Hook Extrafields Update - init extrafieldssdao 2021-05-11 11:35:54 +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
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
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
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
ATM john
63292255cc Fix search accented words in product description 2021-05-05 18:45:23 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
ATM john
6574e54a41 Fix saving template email 2021-05-04 18:09:13 +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
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +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
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
daraelmin
68415322ec
Fix v11 wrong alias in natural_search 2021-04-29 10:00:54 +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
Adrien Raze
e8c2085abd FIX : Change parameters MF to MS for price2num() function 2021-04-27 09:24:22 +02:00
Laurent Destailleur
ea19747bc6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b Fix phpcs 2021-04-27 02:15:58 +02:00
Laurent Destailleur
c7f38c4cf0 Fix bad var 2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7 Fix bad merge 2021-04-27 02:09:43 +02:00
Laurent Destailleur
b3f8a6758e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:13 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
7a6edfd61f
Merge pull request #17295 from atm-gauthier/fix_adv_target_emailing_extrafields_link 
FIX : type link extrafield case for advanced target emailing
 2021-04-27 01:45:26 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options 
Add parameter "option" to hook formattachOptions
 2021-04-26 21:00:12 +02:00
atm-lena
3d3fb17da3 Add parameter "option" to hook formattachOptions 2021-04-23 15:41:43 +02:00
Adrien Raze
c5775cc902 FIX : Add parameter to function price2num() 2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9 FIX : Add function price2num for rounding values in productAlertStock box 2021-04-23 11:11:47 +02:00
Marc de Lima Lucio
ce022ab36c FIX: payment validation: invoices PDF were no re-generated, make it with correct display options 2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470 FIX: payment creation: re-generate invoice PDF with correct display options 2021-04-22 15:56:12 +02:00
atm-greg
74345c4f21 fix warehouse label field edition 2021-04-19 16:03:22 +02:00
stickler-ci
318a783237 Fixing style errors. 2021-04-19 07:19:45 +00:00
Gauthier PC portable 024
8c428081ab FIX : test on link type 2021-04-19 09:17:33 +02:00
Gauthier PC portable 024
ff8aae1209 Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link 2021-04-19 09:16:06 +02:00
Gauthier PC portable 024
5b6439ca5e FIX : cast int 2021-04-19 09:15:47 +02:00
stickler-ci
37f44f4a07 Fixing style errors. 2021-04-16 14:58:57 +00:00
Gauthier PC portable 024
f8fcf7c16b FIX : type link extrafield case for advanced target emailing 2021-04-16 16:55:19 +02:00
Laurent Destailleur
e8bf09862f
Merge pull request #17152 from marc-dll/FIX_12.0_zero_packaging 
FIX: supplier order: error 500 when using packaging with product where it is not defined
 2021-04-09 13:51:16 +02:00
Gauthier PC portable 024
c35c15e782 FIX : test must be === and not == 2021-04-09 11:31:50 +02:00
Marc de Lima Lucio
7df09b6e9e FIX: esupplier order: error 500 when using packaging with product where it is not defined 2021-04-07 10:41:36 +02:00
ptibogxiv
bd88806982
Fix order status label in comm index page 2021-04-05 12:07:51 +02:00
Youvious
5e9ce734a7 Clean llx_accounting_account_be.sql of all 'PRODUCT' and 'SERVICE' (pcg_subtype) 2021-04-03 15:14:33 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
eabe5ae616 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:54 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
af593099df Clean string 2021-03-22 23:52:14 +01:00
Laurent Destailleur
d5865dbfcc
Merge pull request #16791 from Robin-Yann/12.0 
FIX: fix checkbox displayed according to module project setup parameters - work in progress
 2021-03-20 12:06:03 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen 2021-03-20 09:02:29 +01:00
Robin
26dc897042 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 11:12:49 +01:00
Robin
d852816101 FIX: fix checkbox displayed according to module project setup parameters 2021-03-19 09:54:11 +01:00
Robin
b3757a6f69 FIX: fix checkbox displayed according to module project setup parameters - work in progress 2021-03-18 11:07:48 +01:00
Laurent Destailleur
a29a9e5435 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-16 15:14:46 +01:00
Laurent Destailleur
66bbc7f54f
Merge pull request #16734 from AlexisLaurier/11.0 
correct nb_expedition count
 2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f correct nb_expedition count 2021-03-16 15:00:46 +01:00
Laurent Destailleur
d905d92434
Merge pull request #16637 from frederic34/patch-4 
force check if newref needed if project create fail
 2021-03-15 11:31:07 +01:00
Frédéric FRANCE
815a7683a2
force getnextref if project create fail 2021-03-12 16:48:43 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php 2021-03-10 15:29:05 +01:00
atm-lena
b798535af9 FIX create sociales : keep values error form 2021-03-10 14:15:03 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00
Laurent Destailleur
8b555d33e7
Merge pull request #16586 from atm-adrien/FIX/rouding_socialesCard_amount_on_card_updating 
FIX : Rounding amount on social charges card updating
 2021-03-08 16:30:53 +01:00
Laurent Destailleur
20c30bade8
Update card.php 2021-03-08 16:30:32 +01:00
Adrien Raze
67c6577177 FIX : Add "Now" link on social charges card creation 2021-03-08 15:47:02 +01:00
Adrien Raze
cbb7751a15 FIX : rounding amount on card updating 2021-03-08 11:51:18 +01:00
Frédéric FRANCE
c0c9ac439f
Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0 
fix: set class attribute at right place
 2021-03-06 11:18:02 +01:00
Laurent Destailleur
1ad04bb67a
Merge pull request #16548 from frederic34/patch-5 
Fix #16544
 2021-03-06 11:09:58 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Frédéric FRANCE
7543b63a6e
Fix #16544 2021-03-05 08:49:56 +01:00
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0 
avoid warning into modulebuilder
 2021-03-04 16:52:47 +01:00
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
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28: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
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
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
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
Florian Mortgat
d59ee06438 FIX 11.0 - $this->socid injected in query without checking for empty value 2021-02-25 14:51:57 +01:00
Laurent Destailleur
eee936b91c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-22 15:51:16 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Laurent Destailleur
9b0659c50a
Merge pull request #16238 from frederic34/patch-2 
FIX massaction validate invoice do not regenerate pdf
 2021-02-20 17:13:51 +01:00
Laurent Destailleur
dc3377f0f0
Merge pull request #16348 from ptibogxiv/patch-416 
Fix multientity in cash fence report
 2021-02-19 13:51:44 +01:00
Laurent Destailleur
556651a3ae
Update report.php 2021-02-19 13:51:15 +01:00
Iván Mestre
57e9277376 Fixed Bank Account filter resets on payment various 
Changed GET search bank account GET parameter from search_amount to search_account
 2021-02-18 16:23:18 -03:00
ptibogxiv
cafc6a3da2
Fix multientity in cash fence report 
it make no sense to merge cash fence in différent entity with same terminal number.
 2021-02-18 20:04:09 +01:00
Laurent Destailleur
1d6893e928 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-15 16:43:46 +01:00
Laurent Destailleur
6132843586 FIX Filter on date of next generation on template invoices 2021-02-15 16:43:24 +01:00
Laurent Destailleur
a848069178
Merge pull request #16258 from ivanmestre/fix-data-filter-reset-payment-various 
Fix #16241 Date filter resets on Miscellaneous Payments
 2021-02-11 18:59:32 +01:00
Laurent Destailleur
73cd5e144b
Merge pull request #16263 from aspangaro/12p11 
WIP FIX: Accountancy - Fix some problems on CEGID export
 2021-02-11 18:33:40 +01:00
Laurent Destailleur
c306e8ebe9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-11 18:23:47 +01:00
Laurent Destailleur
e1334f34b6 Complete repair to clean not correctly available extrafields on proposal 2021-02-11 18:08:01 +01:00
Alexandre SPANGARO
83f9451b43 FIX: Accountancy - Fix some problems on CEGID export 2021-02-11 13:17:20 +01:00
Iván Mestre
a249f4f35a Fix #16241 Date filter resets on Miscellaneous Payments 
Changed $search_date_start and $search_date_end variables to get values from search_date_start and search_date_end GET parameters if no their value is empty after checking POST parameters
 2021-02-10 15:03:17 -03:00
Iván Mestre
cb4cfbd27d Fixed Bank Account filter resets on payment various 
Changed GET search bank account GET parameter from search_amount to search_account
 2021-02-10 14:43:19 -03:00
Laurent Destailleur
90d1b2d349 Prepare 12.0.5 2021-02-10 18:05:36 +01:00
Laurent Destailleur
9c535d6d7e Fix comment in js must be a js comment 2021-02-09 21:09:46 +01:00
Laurent Destailleur
0e2c27d795 Fix javascript error 2021-02-09 21:06:11 +01:00
ptibogxiv
e5f6a64846
FIX update order by api 
fix update shipping method and shipping date by API (no change with code or functionality juste fix this pb with updating)
 2021-02-09 19:24:36 +01:00
Frédéric FRANCE
71a2c20d4b
massaction validate invoice do not regenerate pdf 2021-02-09 14:32:04 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES 
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
 2021-02-09 13:39:25 +01:00
Laurent Destailleur
1efee54541
Merge pull request #16230 from FHenry/12_fix_error_assignement 
12 fix error assignement
 2021-02-09 13:22:57 +01:00
Laurent Destailleur
8acc5e1486 Fix calculation of profit 2021-02-08 23:37:32 +01:00
Florian HENRY
6bcb63c53d fix indent 2021-02-08 20:46:59 +01:00
Florian HENRY
ff6b5c768d fix indent 2021-02-08 20:46:21 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Laurent Destailleur
8b3c872f2a Fix warning 2021-02-08 17:35:21 +01:00
Laurent Destailleur
3b1143df91
Merge pull request #16223 from ATM-Consulting/fix/12.0_order_addline_remove_warning 
FIX: warning when adding a line if $remise_percent is an empty string
 2021-02-08 17:34:29 +01:00
Florian Mortgat
ff3707b650 FIX: warning when adding a line if $remise_percent is an empty string 2021-02-08 17:24:40 +01:00
Laurent Destailleur
78052e3239 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:24 +01:00
Laurent Destailleur
a143635f53 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:17 +01:00
Laurent Destailleur
25823d7b90
Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY 
Add hidden conf to display supplier in object lines
 2021-02-08 16:58:28 +01:00
Laurent Destailleur
9f9ace0565 FIX Localtax must be converted with price2num 2021-02-07 22:15:21 +01:00
Maxime Kohlhaas
414a2366fb Fix links to go back on supplier invoice list 2021-02-07 19:28:00 +01:00
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
Laurent Destailleur
d8a33b46de Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-06 01:08:46 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
d8c262691b
Merge pull request #16175 from nicolas-eoxia/12_fix_missing_hook 
fix: add missing hook addMoreActionsButtons in viewcat.php
 2021-02-06 00:43:52 +01:00
Laurent Destailleur
e9fa5a647d Fix import 2021-02-05 14:35:10 +01:00