lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
84,118 Commits 43 Branches 150 Tags 886 MiB
2e9cf8d00b
Commit Graph

84118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
5a6d3b7c88
Merge pull request #17372 from marc-dll/FIX_11.0_invoice__generation_after_paiement 
FIX: invoice PDF generation after payment
 2021-04-26 22:49:56 +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
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
521dec7792
Merge pull request #17018 from fmarcet/11.0 
FIX: Show Ref.Supplier in LinkToObjectBlock
 2021-03-31 13:44:53 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +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
Laurent Destailleur
b9a91f92ea
Merge pull request #16984 from aspangaro/10p38 
FIX Search on date in accountancy
 2021-03-29 16:12:31 +02:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
Laurent Destailleur
30543bda71
Merge pull request #16947 from atm-john/11.0_fix_something_that_not_exist 
FIX : shhhhhh ! There is nothing here...
 2021-03-25 01:09:20 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +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
672a07fdac
Merge pull request #16535 from atm-greg/Fix_attach_files_when_models_are_available 
Fix : if mailmodels exist in database attached files are always cleared
 2021-03-04 16:45:00 +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
Laurent Destailleur
ef789376e7
Merge pull request #16501 from atm-gauthier/FIX/HeightForTotWhenTooMuchPayment_SI 
FIX : handling $heightforinfotot when he's superior to a page height …
 2021-03-02 12:49:58 +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
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
a779ce36f3
Merge pull request #16257 from ivanmestre/fix-bank-account-filter-reset-payment-various 
FIX #16241 Bank Account filter resets on payment various
 2021-02-11 18:36:59 +01: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
1282494211
Merge pull request #16243 from ptibogxiv/patch-414 
FIX update order by api
 2021-02-10 01:17:33 +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
Laurent Destailleur
ff9070ff9c
Merge pull request #16206 from atm-maxime/fix_supp_inv_backtolistlink 
Fix links to go back on supplier invoice list
 2021-02-08 15:04:23 +01:00
Maxime Kohlhaas
414a2366fb Fix links to go back on supplier invoice list 2021-02-07 19:28:00 +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
c888ce08c1
Merge pull request #16174 from atm-florianm/fix/10.0_check_withdrawal_already_credited_before_crediting_it 
FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already
 2021-02-06 01:00:56 +01:00
Laurent Destailleur
7d14cde45e
Merge pull request #16173 from fappels/11_backport_price_patch 
FIX: Add critical price patch from 12 to 11.
 2021-02-06 00:59:52 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Francis Appels
1b55935577 Add critical price patch from 12 to 11. 2021-02-05 10:39:46 +01:00
Laurent Destailleur
2576973dc3
Merge pull request #16140 from OPEN-DSI/v11-fix-model-mail-selected 
FIX select default mail template
 2021-02-03 20:26:40 +01:00
Laurent Destailleur
6ab723e85c Fix bad path of include 2021-02-03 17:09:26 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00
Laurent Destailleur
188ed6984f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-01-31 18:54:32 +01:00
Laurent Destailleur
08aa3eac00 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-01-31 18:54:19 +01:00