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

77873 Commits

Author SHA1 Message Date
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
Nicolas
cdd2c165ef add missing hook addMoreActionsButtons in viewcat.php 2021-02-05 11:36:12 +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
3006cf770c FIX Timeout during import 2021-02-05 01:06:59 +01:00
Laurent Destailleur
b58b3a4932 FIX link to create event when task is in a project with a thirdparty 2021-02-04 13:03:05 +01:00
atm-lena
c5f73ec12a Resolve ret 2021-02-04 10:42:42 +01:00
Laurent Destailleur
91c594a66a Fix syntax error 2021-02-03 23:03:47 +01:00
Laurent Destailleur
041decaf93 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:39 +01:00
Laurent Destailleur
4bba124c3f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 20:43:32 +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
c16ed62ada
Merge pull request #16149 from ptibogxiv/patch-410 
FIX cash fence for takepos with multientity
 2021-02-03 19:57:21 +01:00
Laurent Destailleur
8b6de8fe26 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-03 17:09:56 +01:00
Laurent Destailleur
6ab723e85c Fix bad path of include 2021-02-03 17:09:26 +01:00
atm-lena
e9b5a52a4f Add hidden conf to display supplier in object lines 2021-02-03 15:22:04 +01:00
ptibogxiv
3132877349
FIX cash fence for takepos with multientity 2021-02-02 23:09:23 +01:00
Florian HENRY
d3d0617996 fix: manage price min for PRODUIT_CUSTOMER_PRICES 2021-02-02 13:43:33 +01:00
lvessiller
3b050c3452 FIX select default mail template 2021-02-02 10:34:33 +01:00
Laurent Destailleur
99ccfee9ed
Merge pull request #16120 from pvma/12.0 
Fix/FIX: Show missing notification in Event in user dashboard if assigned by others
 2021-01-31 19:07:59 +01:00
Laurent Destailleur
d023afb66f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-31 18:55:11 +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
Laurent Destailleur
9ef5f26624
Merge pull request #14022 from OPEN-DSI/fix_supplier_order_dispatching 
FIX: Fix detect dispatched product and set to received completely when the supplier order have services
 2021-01-31 18:51:57 +01:00
Paul Vincent M. Ancajas
d80709a7b9 Fix/FIX: making sure the return agenda is only specific to user 2021-02-01 01:41:19 +08:00
Laurent Destailleur
758d91b4a3
Merge pull request #16087 from ATM-Consulting/fix/11.0_required_extrafields_of_type_sellist_not_properly_checked 
FIX 11.0 - mandatory extrafields of type sellist
 2021-01-31 18:18:05 +01:00
stickler-ci
726e0ceff0 Fixing style errors. 2021-01-31 08:16:59 +00:00
Paul Vincent M. Ancajas
80714d8d6d Fix/FIX: Show notification in Event box of user in his dashboard if assigned by others 2021-01-31 16:09:35 +08:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Alexandre SPANGARO
413fc95f9a FIX: Accountancy - label_operation is used instead of label_compte 2021-01-28 23:40:15 +01:00
Laurent Destailleur
62622a2065 Fix: It was no more possible to create paymentintent for offline payment 2021-01-28 23:16:24 +01:00
Laurent Destailleur
1a52eb5ffa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 19:52:17 +01:00
Laurent Destailleur
099fcd7e4e Fix test email 
Conflicts:
	htdocs/admin/mails.php
 2021-01-28 19:51:54 +01:00
Laurent Destailleur
33964c659e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 14:14:14 +01:00
Laurent Destailleur
d637bbd7e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 14:14:03 +01:00
Laurent Destailleur
c63a124d1c More complete fix 2021-01-28 14:13:29 +01:00
Juanjo Menent
2f98d8035c Fix: Bad supplier price updater 2021-01-28 13:37:43 +01:00
Laurent Destailleur
19a5caf212 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2021-01-28 00:18:35 +01:00
Laurent Destailleur
2be157c91f Trans 2021-01-28 00:18:11 +01:00
Florian Mortgat
8dfe39258b FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion 2021-01-27 23:46:09 +01:00
Laurent Destailleur
76fb64e8fe Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-27 21:05:17 +01:00
Laurent Destailleur
dd70bee773 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-27 21:05:09 +01:00
Florian Mortgat
35448e3307 FIX 11.0: when a new intervention is created from an object, a new $extrafields object is instantiated but not initialized 
Because of this, missing mandatory extrafields are not checked and no extrafields are inserted
 2021-01-26 12:42:04 +01:00
ptibogxiv
ae2b61d5ef
Fix stripe off_session set/unset 2021-01-23 18:49:11 +01:00
Laurent Destailleur
9b6b1e055c Fix trans 2021-01-23 12:20:18 +01:00
Laurent Destailleur
86e853f27d Look and feel v12 2021-01-23 12:18:07 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Laurent Destailleur
5aba1f9ccd FIX missing socid into link to create event from project agenda tab 2021-01-22 01:07:45 +01:00
Laurent Destailleur
0e684abceb
Merge pull request #16039 from ATM-Consulting/fix/12.0_ticket_extrafields_of_type_date_are_not_saved 
FIX 12.0 - ticket extrafields of type 'date' are not saved
 2021-01-21 18:27:36 +01:00
BlackMirror
a55d23f363 [FM] FIX - ticket extrafields of type 'date' are not saved 2021-01-21 15:55:52 +01:00
BlackMirror
640cf50b7f [FM] Fix 12.0 - duplicate label, probably mistaken for ref 2021-01-20 15:20:50 +01:00
Laurent Destailleur
560d401cff Code comment 2021-01-19 15:54:24 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Laurent Destailleur
0917b37bb9 FIX #15966 #15967 2021-01-19 15:20:35 +01:00
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +01:00
Florian HENRY
6b61545189 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fix_autofill_date_payment 2021-01-18 19:07:30 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0 
extrafeild selllist can be use with string fk
 2021-01-18 18:53:01 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend 
FIX : missing GETPOST parameters on card_presend.tpl.php
 2021-01-18 18:49:28 +01:00
Laurent Destailleur
a109dd8948 Fix removed unexpected values in stats graph 
Conflicts:
	htdocs/projet/graph_opportunities.inc.php
 2021-01-18 13:55:11 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
1cd0f71c09 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-18 09:12:29 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00
Laurent Destailleur
440f923b01
Merge pull request #15983 from zuiko/patch-2 
Fix #15820 Bug: Unable to edit the pricing in Sales Order
 2021-01-16 18:34:41 +01:00
Laurent Destailleur
8b9287055e
Update functions.lib.php 2021-01-16 18:34:25 +01:00
Laurent Destailleur
1d5182adf0
Merge pull request #15973 from frederic34/patch-10 
missing default value
 2021-01-16 17:27:33 +01:00
Laurent Destailleur
871691bf69 Fix missing popup 2021-01-16 16:34:49 +01:00
kevin
fb14f7c0b8 Modify GETPOST parameters to match with v12 2021-01-15 14:40:55 +01:00
Florian Mortgat
d3cbcedce3 FIX 12.0 (ticket) - the "openall" filter on the ticket list does not include tickets with status READ 2021-01-15 09:55:42 +01:00
zuiko
fd5948f716
Update functions.lib.php 
Fix #15820
Fix #15820
function price2num
add underscore in the pattern in instruction 
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
it seems that some constantes use also "-" so I added it in the pattern.
I don't know if other characters have to be added to this pattern.
 2021-01-14 15:00:53 +01:00
zuiko
727751e0c1
Update functions.lib.php 
Fix #15820
function price2num
add underscore in the pattern in instruction 
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
I don't know if other characters have to be added to this pattern.
 2021-01-14 14:44:32 +01:00
Florian HENRY
0fa7134bd1 better fix 2021-01-14 13:04:02 +01:00
Laurent Destailleur
ea47a55144 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-14 12:59:27 +01:00
Laurent Destailleur
1cf86931b3 Fix graph of opportunity when a status has been removed. 2021-01-14 12:58:50 +01:00
Frédéric FRANCE
11100b3017
missing default value 2021-01-13 15:16:43 +01:00
Florian HENRY
7e30812529 fix review 2021-01-12 22:01:53 +01:00
Florian HENRY
33d7998a96 fix: date auto fill date paiement tax 2021-01-11 19:47:20 +01:00
Florian HENRY
e5ef455628 fix: date auto fill date paiement tax 2021-01-11 19:46:08 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
atm-lena
f17474a8de 12.0 FIX Translation Permission777 FR 2021-01-11 16:56:19 +01:00
Laurent Destailleur
788ef257a9 Fix GETPOST for qty 2021-01-11 13:02:05 +01:00
Laurent Destailleur
fe7be8362f Fix td balance 2021-01-11 12:03:28 +01:00
Laurent Destailleur
a3fd6f07e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-08 15:10:05 +01:00
Laurent Destailleur
243b227c33 Fix prerequisites 2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f Update doc 2021-01-08 15:09:16 +01:00
Laurent Destailleur
8ca639b79f
Merge pull request #15916 from atm-maxime/fix_commonfieldadd_type 
Fix date and datetime type in commonfield_add.tpl
 2021-01-07 10:28:10 +01:00
Maxime Kohlhaas
1b7d194e18 Finish fix on add form values 2021-01-07 09:03:25 +01:00
Laurent Destailleur
1aa7e4adeb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 21:32:46 +01:00
Laurent Destailleur
0dc182553e
Merge pull request #15896 from atm-lena/FIX/issue_14197 
FIX balance starting and ending fiscal month #14197
 2021-01-06 21:32:02 +01:00
Laurent Destailleur
2a31ca969f FIX #15388 #15891 2021-01-06 21:29:58 +01:00
Laurent Destailleur
8918299364
Update commonfields_add.tpl.php 2021-01-06 21:24:37 +01:00
Maxime Kohlhaas
42e45d4a7a Fix date and datetime type in commonfield_add.tpl 2021-01-06 21:14:40 +01:00
Laurent Destailleur
93323f6d61
Merge pull request #15889 from atm-quentin/FIX/issue_15516 
FIX wrong name for search status param issue #15516
 2021-01-06 20:35:52 +01:00
Laurent Destailleur
8f1617884a
Merge pull request #15888 from atm-quentin/FIX/issue_15659 
FIX issue 15659 : Missing test if supplier conf is enabled
 2021-01-06 20:35:34 +01:00
Laurent Destailleur
679948e207
Merge pull request #15893 from atm-lena/FIX_issue_15629 
FIX #15629
 2021-01-06 20:34:31 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-06 20:27:46 +01:00
Laurent Destailleur
9e50a06f2b
Merge pull request #15894 from atm-john/11.0_fix_issue_14833 
Fix #14833 A security mecanism generates data loss
 2021-01-06 20:26:19 +01:00
Laurent Destailleur
a955df21bf
Merge pull request #15905 from atm-quentin/FIX/issue_14501 
FIX useless tracking number displayed on pdf if empty issue #14501
 2021-01-06 20:22:43 +01:00
Laurent Destailleur
170814c718 Fix missing rollback 2021-01-06 20:21:22 +01:00
Laurent Destailleur
7f21332533 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 20:12:17 +01:00
Laurent Destailleur
17306bc715 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_shipments.php
 2021-01-06 20:12:09 +01:00
Laurent Destailleur
7372a18283
Update box_shipments.php 2021-01-06 19:56:49 +01:00
Laurent Destailleur
33b138b5ba
Merge pull request #15904 from atm-jpb/12.0_Fix 
Fix add ticket on elementList
 2021-01-06 19:48:10 +01:00
Laurent Destailleur
99066eaf5c
Merge pull request #15912 from atm-jpb/12.0_fix_cat_product_list 
FIX : add categories params  on llxHeader filter
 2021-01-06 19:38:57 +01:00
Laurent Destailleur
4f2c6e2901
Merge pull request #15911 from atm-kevin/Fix_create_contact_from_thirdparty_from_member 
Fix #15829
 2021-01-06 19:33:25 +01:00
Laurent Destailleur
fead1b7e86
Merge pull request #15907 from atm-kevin/Fix_multicurrency_supplier_invoice_puht_devise 
Fix #14353
 2021-01-06 19:32:53 +01:00
jpb
2be2cdaadf fix style errors 2021-01-06 16:06:03 +01:00
ATM john
cf324f75d7 Fix bom line unit display #13831 2021-01-06 16:01:19 +01:00
jpb
99b977a08e add categories params on llxHeader filter 2021-01-06 15:38:30 +01:00
kevin
5164a96aa0 Fix #15829 2021-01-06 15:35:33 +01:00
kevin
e8ba4de832 Fix #14353 2021-01-06 14:46:56 +01:00
stickler-ci
ca557cfacd Fixing style errors. 2021-01-06 13:22:35 +00:00
quentin
e44b14364a FIX useless tracking number displayed on pdf if empty 2021-01-06 14:17:06 +01:00
jpb
19ee163f31 Fix add ticket on elementList 2021-01-06 13:54:51 +01:00
ATM john
50b5226d10 FIX #15465 External user sees last 5 shipments to other customers in the dashboard 2021-01-06 12:40:38 +01:00
atm-lena
4b9bb824d0 FIX balance starting and ending fiscal month #14197 2021-01-06 11:16:51 +01:00
ATM john
92a4314779 Fix security mecanism generating data loss 2021-01-06 10:45:54 +01:00
atm-lena
6f15683709 FIX create ticket : thirdparty/contact notification #15629 2021-01-06 10:42:48 +01:00
quentin
2f932330d3 FIX wrong name for search status param 2021-01-06 10:10:39 +01:00
quentin
7161ca9e70 FIX issue 15659 : Missing test if conf is enabled 2021-01-06 09:54:02 +01:00
Laurent Destailleur
58e33c59f4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:07:53 +01:00
lvessiller
ca6899c138 FIX right to show VAT rate in product list 2021-01-05 16:11:46 +01:00
Laurent Destailleur
1960c712df
Merge pull request #15866 from atm-maxime/fix_contactelement 
Fix dict contact type element list
 2021-01-04 12:02:57 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php 2021-01-04 12:02:41 +01:00
Juanjo Menent
d892d8c3c7 FIX: Bad dates filtering in the ticket list causes sql error 2021-01-04 10:59:45 +01:00
Maxime Kohlhaas
e190b010d3 Fix dict contact type element list 2021-01-03 16:05:04 +01:00
Laurent Destailleur
8ad5dc81de GETPOST 2021-01-03 15:13:29 +01:00
Laurent Destailleur
f462f68056 Code comment 2021-01-03 15:10:33 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
d46eb08083 More log and use id to refresh/reload an invoice. 2021-01-02 15:36:19 +01:00
Laurent Destailleur
a8d15fafd2 Fix missing span 2021-01-02 14:17:54 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +01:00
Laurent Destailleur
40d19e6c36 Fix tooltip on timezone 2020-12-30 22:01:26 +01:00
Laurent Destailleur
79da047802 FIX Dates of sales start in TakePOS 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:46:40 +01:00
Laurent Destailleur
1ec763fc14 FIX When creating a new POS sell, the creation date must be modified. 2020-12-30 21:22:54 +01:00
Laurent Destailleur
c6c697cb43
Merge pull request #15835 from aspangaro/12p10 
FIX: #15751 Miscellaneous payment type change to 0 after updating subledger account
 2020-12-30 12:42:57 +01:00
Laurent Destailleur
9e04217e35
Merge pull request #15802 from aspangaro/12p9 
FIX: Accountancy - Retire entire opening balance feature
 2020-12-30 11:21:34 +01:00
Alexandre SPANGARO
a336e45098 FIX: #15751 Miscellaneous payment type change to 0 after updating subledger 2020-12-30 08:11:20 +01:00
Alexandre SPANGARO
0e2b7d8b3c Remove typo 2020-12-30 07:23:26 +01:00
Laurent Destailleur
c3326a0963 FIX Creation of thirdparty when setup is empty 2020-12-29 04:30:37 +01:00
Alexandre SPANGARO
49a1268ba1 Merge branch '12.0' into 12p9 2020-12-28 03:12:57 +01:00
Alexandre SPANGARO
26791714ce Fix : Introduce constant ACCOUNTANCY_SHOW_OPENING_BALANCE 2020-12-28 03:07:33 +01:00
Laurent Destailleur
d2af03856c
Merge pull request #15808 from FHenry/12.0 
fix: colspan balance accountanty
 2020-12-27 13:56:07 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
360a85cbbc FIX add autofix of count of email target when data is corrupted 2020-12-24 12:32:34 +01:00
Florian HENRY
60d8fb4719 fic porject mass action right 2020-12-24 00:48:48 +01:00
Florian HENRY
7d1d588225 fix service right problem for mass action 2020-12-23 23:48:45 +01:00
Laurent Destailleur
8658f903fa FIX Must delete extrafields before main table on product deletion. 2020-12-23 15:00:25 +01:00
Florian HENRY
77c335c5f3 fix colspan balance accountanty 2020-12-23 09:19:56 +01:00
Alexandre SPANGARO
f273273129 FIX: Accountancy - Retire entire opening balance feature 2020-12-22 06:57:55 +01:00
Laurent Destailleur
33f8c53cca Fix var_dump 2020-12-20 14:03:10 +01:00
Laurent Destailleur
8c87050703 FIX Check of customer/vendor code fails in some cases 2020-12-20 13:54:02 +01:00
Laurent Destailleur
31790e255c
Merge pull request #15756 from zuiko/patch-1 
Update V12 fournisseurs.php to Fix #15755 Product: purchase price tab, supplier price table with list of products not "responsive"
 2020-12-19 14:56:16 +01:00
ptibogxiv
22b2247442
Update sms.php 2020-12-19 13:41:49 +01:00
Laurent Destailleur
f10c69680c Ajax combo at a better place (after select) 2020-12-17 21:42:10 +01:00
Laurent Destailleur
c97fcaec87 Better fix select2 bug https://github.com/select2/select2/issues/5832 2020-12-17 21:41:39 +01:00
Laurent Destailleur
b5db5f7474 Better responsive 2020-12-17 21:11:44 +01:00
Laurent Destailleur
f79dec80e6 Fix phpcs 2020-12-17 16:45:56 +01:00
Laurent Destailleur
73dfa7d44a Try a better fix for #15770 2020-12-17 14:37:02 +01:00
Laurent Destailleur
768e143188 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-17 14:10:57 +01:00
Laurent Destailleur
b04cc22350 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/prelevement.php
 2020-12-17 14:10:45 +01:00
Laurent Destailleur
f0d787debb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-17 14:07:24 +01:00
Laurent Destailleur
27542ed8ed
Update prelevement.php 2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce
Update prelevement.php 2020-12-17 13:52:03 +01:00
Haldarys
10ac74162e Fix PRELEVEMENT_ADDDAYS check 
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
 2020-12-17 10:19:21 +01:00
atm-lena
cb2c1f3ece FIX Facture Situation Out : status condition 2020-12-16 10:54:32 +01:00
Laurent Destailleur
17bd362d3c
Merge pull request #15760 from FHenry/fix_duplicate_customersupliercode 
Fix duplicate customersupliercode
 2020-12-16 00:24:16 +01:00
stickler-ci
9ca2e98a66 Fixing style errors. 2020-12-15 21:12:52 +00:00
Florian HENRY
b80bd8d1f8 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:03:15 +01:00
Florian HENRY
7a93c11ae0 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:01:33 +01:00
zuiko
943f1022c0
Update fournisseurs.php 
Product: purchase price tab, the supplier price table with its list of products is not "responsive", as a result, the right-clickable areas, including the "Add purchase price" button, disappear to the right of the screens that are not full HD which forces the user to drag his window with the mouse.
The solution is to change the CSS class of the table to adopt the CSS class of the equivalent table of the selling price tab, which is "responsive" to it.
We therefore replace :
print '<table class="centpercent list">';
by :
print '<table class="noborder centpercent">';

Knowing that the class is used in 24 files, there might be other places where this class poses the same ergonomic problem. I don't know enough Dolibarr to generalize the correction ...
 2020-12-15 09:26:27 +01:00
Laurent Destailleur
5f9b53004b Fix warning 2020-12-14 17:40:40 +01:00
Laurent Destailleur
56c32e3c81 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:33 +01:00
Laurent Destailleur
4f79fdb4ab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:25 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +01:00
Laurent Destailleur
ac34fce015
Merge pull request #15696 from StephaneLesage/12importexporticonslabels 
Fix & sync import/export entity icons/labels translation
 2020-12-13 12:50:30 +01:00
Juanjo Menent
4fc57d096e Fix #15556 2020-12-12 20:37:00 +01:00
Laurent Destailleur
2592344601 Fix missing price2num 2020-12-12 17:27:27 +01:00
Laurent Destailleur
b3d49c4dce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-11 15:54:31 +01:00
Laurent Destailleur
4fcd3fe493 Fix disallow -- string into filename for security purpose. Vulnerability 
reported by Yılmaz Değirmenci
 2020-12-11 15:12:42 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
Ferran Marcet
7360fcd03e FIX: Bad rigths to send contract 2020-12-10 13:11:55 +01:00
Laurent Destailleur
89854ea137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 22:24:14 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
51128c1d55
Merge pull request #15692 from ATM-Consulting/FIX/12.0_regression_basic_html_tags_no_longer_allowed_in_product_label 
FIX 12.0 - XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
 2020-12-08 22:09:27 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
 2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
 2020-12-08 18:11:39 +01:00
Laurent Destailleur
996e01fe6a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 17:52:01 +01:00
Laurent Destailleur
485fe0fc62 FIX Can receipt of a product that required lot after disabling stock and 
lot module
 2020-12-08 17:51:26 +01:00
Florian Mortgat
617c9f7ea9 FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML 2020-12-08 09:30:31 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Laurent Destailleur
669205af1c
Update product.class.php 2020-12-07 19:02:49 +01:00
Florian Mortgat
f871ade545 FIX 12.0 - the stringent XSS prodection provided by 'alphanohtml' causes problems with some clients who used basic tags (bold, italic, underline) in product labels. Using 'restricthtml' instead could be a good compromise. 2020-12-07 15:15:41 +01:00
Frans Bosman
7ad70c7c21
Update product.class.php 
Added Hidden Option STOCK_DEFAULT_BATCH, in order to replace the default '000000' batchnumber for the existing stock  when batchnumbers are enabled for a product.
 2020-12-07 14:33:44 +01:00
Laurent Destailleur
d1c66059cd Add missing tag order_ref and order_ref_customer on shipments for ODT 
generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-12-06 19:03:46 +01:00
Laurent Destailleur
3770eef8dc Fix can import all categories 2020-12-04 19:51:14 +01:00
Laurent Destailleur
c1b6e58bbd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-04 19:12:22 +01:00
Laurent Destailleur
e0b737b622
Merge pull request #15650 from atm-lena/12.0_FIX_PriceToNum_ConvertNegativToPositiv 
pricetonum() - preg-replace() delete "-" negativ number
 2020-12-04 18:19:22 +01:00
Laurent Destailleur
aeda250df4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/install/mysql/data/llx_c_shipment_mode.sql
 2020-12-04 18:14:57 +01:00
Laurent Destailleur
bc7cb4a148
Merge pull request #15640 from ATM-Consulting/FIX/12.0_Opensurvey_filters_by_entity_but_always_sets_entity_to_1 
FIX 12.0 - on survey creation, entity is always set to 1 ⇒ set it to $conf->entity
 2020-12-04 18:11:24 +01:00
Laurent Destailleur
46bb49c490
Merge pull request #15638 from ptibogxiv/patch-396 
Fix limit product in customer margins
 2020-12-04 18:10:49 +01:00
Laurent Destailleur
628257d771
Merge pull request #15649 from atm-benoit/FIX_SUPPLIER_PROPOSAL 
Fix supplier proposal
 2020-12-04 18:06:08 +01:00
Francis Appels
223205cf9d Fix volume calcution, depends on surface not surface_units 
surface_unit can be 0 for m2
 2020-12-04 16:54:40 +01:00
atm-lena
d22646e6ae pricetonum() - preg-replace() delete "-" negativ number 2020-12-04 16:06:10 +01:00
stickler-ci
ddf82f3e7a Fixing style errors. 2020-12-04 14:45:26 +00:00
atm-benoit
b9461322d9 FIX SUPPLIER PROPOSAL v12 bug add 2020-12-04 15:37:00 +01:00
atm-benoit
575bb7d420 FIX SHIP MODE install v12 bug insert 2020-12-04 14:20:25 +01:00
Florian Mortgat
7685ed8295 FIX excess comma 2020-12-04 10:10:44 +01:00
Florian HENRY
94d57cd462 fix rounding 2020-12-04 10:03:06 +01:00
Florian Mortgat
c752bfe1a6 FIX 12.0 - set entity to $conf->entity (instead of 1 by default) when creating a survey; otherwise the survey cannot be listed from the entity it was created on unless it is the main entity 2020-12-04 10:02:39 +01:00
ptibogxiv
d712e1e6d4
Fix limit product in customer margins 
Fix limit of 20 products in product list/search
 2020-12-04 09:42:30 +01:00
Florian HENRY
7a5a6a14f0 fix At install insert shipment mode failed 2020-12-04 09:10:36 +01:00
Alexandre SPANGARO
0a24298385 FIX: Problem on supplier payment card 2020-12-04 02:57:40 +01:00
Laurent Destailleur
ac30348081 Prepare 12.0.4 2020-12-03 19:16:34 +01:00
Laurent Destailleur
df48704154 Fix label 2020-12-03 18:45:56 +01:00
Laurent Destailleur
8a7f7b3551 FIX Request on purchase orders in timeout even on very small databases 2020-12-03 18:38:18 +01:00
Laurent Destailleur
a1428c963b Fix phpcs 2020-12-03 16:53:26 +01:00
Laurent Destailleur
c8eaa4743c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-03 16:35:56 +01:00
Laurent Destailleur
ac29db92cb FIX #15618 2020-12-03 16:35:42 +01:00
Laurent Destailleur
35766fb5bf
Merge pull request #15625 from atm-florianm/FIX/12.0_error_when_adding_lines_on_order 
FIX 12.0 - error when displaying lines on order after adding a new line
 2020-12-03 14:30:25 +01:00
Laurent Destailleur
068587fcee
Update card.php 2020-12-03 14:30:07 +01:00
Laurent Destailleur
af4f473c93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_produits.php
 2020-12-03 11:22:34 +01:00
Laurent Destailleur
0ad6ee209a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-03 11:21:08 +01:00
Laurent Destailleur
b324425db8 code comment 2020-12-03 11:19:41 +01:00
Laurent Destailleur
0fd865d8af FIX Better error message with IMAP when connection fails 2020-12-03 11:16:02 +01:00
Florian Mortgat
17d5bb5cd4 FIX 12.0 - error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated 2020-12-02 22:25:08 +01:00
Laurent Destailleur
589da1d4b9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-02 19:40:19 +01:00
Laurent Destailleur
bc1dc1e9f0 FIX #15590 manually 2020-12-02 19:34:04 +01:00
Laurent Destailleur
a2dca42965
Revert "Create/Edit extra-field with multi-line text area for computed value" 2020-12-02 18:55:55 +01:00
Laurent Destailleur
4918b41384
Merge pull request #15607 from StephaneLesage/12edit-extrafield-computed-multiline 
Create/Edit extra-field with multi-line text area for computed value
 2020-12-02 18:55:47 +01:00
Stephane Lesage
1c4876b417 more transporters in llx_c_shipment_mode.sql 2020-12-01 21:17:03 +01:00
Stephane Lesage
3caf65ce6f Create/Edit extra-field with multi-line text area for computed value 2020-12-01 19:30:09 +01:00
Laurent Destailleur
fde7c4ffb3
Merge pull request #15575 from StephaneLesage/fix12-userlist-filter-by-gender 
Fix Users list filter by gender
 2020-11-30 15:48:06 +01:00
Laurent Destailleur
7870a33fd3
Update invoice.php 2020-11-30 15:39:35 +01:00
stickler-ci
9ee37153f7 Fixing style errors. 2020-11-30 10:32:58 +00:00
teleassist
560194c3b9
FIX #15374 : "New" doesn't clear total amounts 
Invoice's total amounts where not updated because of direct lines deleting in database.
 2020-11-30 11:22:49 +01:00
Laurent Destailleur
4f762cf73d Fix label 2020-11-30 08:29:19 +01:00
Stephane Lesage
0046bfc53f Fix Users list filter by gender 2020-11-29 23:42:47 +01:00
Laurent Destailleur
58eaef37d2 Fix regression 2020-11-29 21:29:22 +01:00
Laurent Destailleur
d45fe6c17f FIx #15551 2020-11-29 20:39:39 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Laurent Destailleur
df17c2f26a Removed dead code generating warning. 
CSS
 2020-11-28 16:48:32 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +01:00
Laurent Destailleur
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
4da4499569 FIX Param joinfiles not sanitized 
Conflicts:
	htdocs/admin/mails_templates.php
 2020-11-26 23:07:52 +01:00
Laurent Destailleur
b043442b91 Fix link and selection of status of purchase order. 2020-11-26 17:53:57 +01:00
Laurent Destailleur
22c2cfd9ec FIX warning for purchase order delivery late. 2020-11-26 16:57:39 +01:00
Laurent Destailleur
3ccc9d3e57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-26 15:29:57 +01:00
Laurent Destailleur
bd780a8c51 FIX Warning on late purchase order delivery 2020-11-26 15:29:18 +01:00
Laurent Destailleur
f91226a9f0
Merge pull request #15537 from maboelfotoh/maboelfotoh-fix-pr-13067 
FIX #13067 including opening balance in calculation of displayed balance
 2020-11-25 17:54:09 +01:00
Laurent Destailleur
168e35a035 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-25 17:29:09 +01:00
Laurent Destailleur
16e3baeff2 FIX filter on project list 2020-11-25 17:28:53 +01:00
Muhammad Aboelfotoh
551256b779 FIX #13067 including opening balance in calculation of displayed balance 2020-11-25 15:11:09 +00:00
Laurent Destailleur
c9371e9eb0
Merge pull request #15512 from fappels/12_fix_transfer_expline_extrafield 
Fix issue #15506 tansfer line extrafield order  to expedition
 2020-11-25 15:30:07 +01:00
Francis Appels
a734e1caa7 line is order line not exp line 2020-11-25 15:06:07 +01:00
Jean-Sébastien Pédron
9b1dbf8d2a
llx_accounting_account_fr.sql: Remove left over field data 
In commit 86d9622360, the `pcg_subtype`
was removed from the inserted values.

In commit a85dfaf71e, values associated
with this field were removed. However, at least two lines in the
PCG99-BASE accounting accounts still had that field values.

This led to errors when importing the PCG99-BASE accounts. This patch
fixes the problem and the accounts can be imported successfully.
 2020-11-24 22:19:21 +01:00
Laurent Destailleur
d17ecbeccd Fix #15438 2020-11-24 20:56:11 +01:00
Francis Appels
7eec1155a0 Fix issue #15506 tansfer line extrafield order to expedition 2020-11-24 18:58:37 +01:00
Laurent Destailleur
faa33f2d3c FIX #15501 2020-11-24 12:52:39 +01:00
Laurent Destailleur
817de18a5d Fix remove log 2020-11-24 12:25:32 +01:00
Laurent Destailleur
14ea3a1697 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-24 10:56:43 +01:00
Laurent Destailleur
53208e620e Use of . as thousand separator. Can use it for decimal if not 3 digits. 2020-11-24 10:56:05 +01:00
Frédéric FRANCE
69ea0ea791
Update box_produits.php 2020-11-23 23:44:15 +01:00
Frédéric FRANCE
c7d886c918
fix status on tooltip in box last product 2020-11-23 23:25:09 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to 
FIX  Dol print error : conf usage thirdparty propagate extrafields to
 2020-11-23 21:43:03 +01:00
Laurent Destailleur
5822fcfbed FIX several warning with the barcode use in ODT templates 2020-11-23 21:38:45 +01:00
Laurent Destailleur
9cb5673c36 Fix remove var_dump 2020-11-23 19:46:24 +01:00
Laurent Destailleur
c5278197fb More phpunit test for price2num 2020-11-23 19:45:11 +01:00
Laurent Destailleur
e7dbc8407f FIX formating of prices with foreign languages 2020-11-23 19:08:26 +01:00
ATM john
fbc911aea1 Fix conf usage thirdparty propagate extrafields to 2020-11-23 16:40:31 +01:00
Florian Mortgat
6c75997b27 FIX wrong tab 2020-11-20 19:15:15 +01:00
Florian Mortgat
f7228d96af FIX 12.0 - when the cronjob 'params' field is empty, the cron method is called with one empty string param instead of no params at all 2020-11-20 19:12:59 +01:00
Laurent Destailleur
823e399d8d
Merge pull request #15428 from atm-quentin/FIX/actioncomm_desc_cant_be_empty 
FIX cant empty action comm desc
 2020-11-18 12:47:37 +01:00
Laurent Destailleur
4ae121d870 FIX Can't create shipment for virtual product. Add 
STOCK_EXCLUDE_VIRTUAL_PRODUCTS as a quick hack to solve this.
 2020-11-16 19:43:45 +01:00
quentin
6ce006f853 FIX cant empty action comm desc 2020-11-16 15:46:16 +01:00
Laurent Destailleur
b9192744cc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 17:16:05 +01:00
Laurent Destailleur
30681f9179 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-15 17:15:56 +01:00
Maxime Kohlhaas
44c5988853 Fix #15377 ticket list filter on author 2020-11-15 10:42:15 +01:00
BlueGarm
2425cf82d3 Add Partially Received Order and Delay 
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
 2020-11-14 13:25:02 +01:00
Mikaël MARTIN
0c37d31e04
Update box_supplier_orders_awaiting_reception.php 2020-11-14 13:01:36 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
777ae9af9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:12:13 +01:00
Laurent Destailleur
02158928cc FIX #15365 export of extrafields for user and resources 2020-11-12 14:11:59 +01:00
Frédéric FRANCE
ad05451427
Fix missing getpost for scandir odt path 2020-11-12 11:23:03 +01:00
Florian HENRY
b16af0a7c3 fix deprecated warning php 7.4 2020-11-11 15:43:36 +01:00
Laurent Destailleur
73df033000 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/boxes/box_birthdays.php
 2020-11-10 11:05:53 +01:00
quentin
fb27c98f9c FIX : handling $heightforinfotot when he's superior to a page height 2020-11-10 09:40:45 +01:00
Laurent Destailleur
8458025e1d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-09 19:47:33 +01:00
Laurent Destailleur
4a5c7d299f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-11-09 19:47:25 +01:00
Florian Mortgat
bf27c56fa7 Following PR#15336: it should not be possible to modify the third party of an invoice 2020-11-09 17:09:06 +01:00
Alexandre SPANGARO
0a078da8e4 FIX: Accountancy - Some ajustments on length of the account 2020-11-09 14:59:29 +01:00
Alexandre SPANGARO
617c930574 FIX: Accountancy - Some ajustments on length of the account (general & auxiliary) 2020-11-09 14:13:09 +01:00
Got2be
2f11f4e104 FIX : disabled users must not be available in sales representative list on societe edit mode 2020-11-09 11:22:07 +01:00
atm-lena
047785b273 FIX - Don't display inactive users in birthday box and soc card 2020-11-06 11:58:36 +01:00
Laurent Destailleur
4689d42afd FIX #15303 2020-11-05 14:10:46 +01:00
Laurent Destailleur
6080e5335f Minor fix 2020-11-05 12:56:20 +01:00
Laurent Destailleur
9380ea4bc5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-05 09:43:38 +01:00
Laurent Destailleur
a5328f4230 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-05 09:43:28 +01:00
Laurent Destailleur
6bb598498e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-11-05 09:42:51 +01:00
Laurent Destailleur
4b7c8a0d1d
Merge pull request #15291 from prietojc/12.0_patch-1 
FIX force payment mode to withdraw
 2020-11-04 20:36:29 +01:00
jcp
1f483d7c28 Fix force payment mode to create withdrawal 2020-11-04 11:43:03 +01:00
jcp
3ce7a23c70 Revert "NEW massaction for BankTransfer" 
This reverts commit a39ff26def.
 2020-11-03 20:21:53 +01:00
jcp
a39ff26def NEW massaction for BankTransfer 2020-11-03 20:16:56 +01:00
jcp
bae05bbe7d Fix computed import 2020-11-03 18:43:03 +01:00
Laurent Destailleur
f25a6b2e67
Merge pull request #15213 from ATM-Consulting/fix/10.0_delete_action_from_redirect_url_when_reordering_lines 
FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines
 2020-11-02 09:41:00 +01:00
Florian Mortgat
400acf9f65 FIX - 10.0 - regex to remove 'action' parameter: taking feedback from PR#15213 into account 2020-11-02 08:26:36 +01:00
Laurent Destailleur
2cdbfa2048 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-01 17:45:22 +01:00
Laurent Destailleur
72160deef7 FIX #14979 2020-11-01 17:01:26 +01:00
Laurent Destailleur
ad922bfde6 FIX #15074 2020-11-01 16:08:09 +01:00
Laurent Destailleur
49ccf2a3cb Update doc 2020-11-01 15:55:51 +01:00
Laurent Destailleur
45f834cb15 FIX #15199 2020-11-01 15:20:33 +01:00
Laurent Destailleur
63a03cdad6 FIX #15208 2020-11-01 14:34:29 +01:00
Laurent Destailleur
41b938047d Fix doc 2020-10-31 14:51:32 +01:00
Laurent Destailleur
9113ecedfa code comment 2020-10-31 12:55:26 +01:00
Laurent Destailleur
623cb54480 Prepare a more complete fix for #15016 2020-10-31 12:30:47 +01:00
Laurent Destailleur
a4d2927f82 Fix for #15016 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-10-31 12:18:54 +01:00
Laurent Destailleur
d9ca9fe22d Fix clean of contract 2020-10-30 14:50:38 +01:00
ATM john
61cb99117a Add missing lang trans 2020-10-30 09:33:07 +01:00
Laurent Destailleur
5504e3b236 Fix phpcs 2020-10-30 05:58:40 +01:00
Laurent Destailleur
1a02504792 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/security2.lib.php
 2020-10-30 04:26:09 +01:00
Laurent Destailleur
f51b02026c Fix regression 2020-10-30 04:24:06 +01:00
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
 2020-10-30 04:21:07 +01:00
Laurent Destailleur
f5a156ee06 Fix regression 2020-10-30 04:17:02 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +01:00
Laurent Destailleur
925669ee33 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-30 03:25:52 +01:00
Laurent Destailleur
f22017080d Fix for php8 2020-10-30 03:25:33 +01:00
Laurent Destailleur
e79a061c19
Merge pull request #15204 from frederic34/patch-6 
Update timeline.inc.php
 2020-10-29 17:46:31 +01:00
Laurent Destailleur
ee4a827627 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/db/DoliDB.class.php
 2020-10-29 13:10:10 +01:00
Laurent Destailleur
d7225327e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-29 11:13:29 +01:00
Laurent Destailleur
2a386b6fea Fix set subledger account 2020-10-29 11:13:18 +01:00
Laurent Destailleur
91cf5de54d Fix bad sort order 2020-10-29 11:06:18 +01:00
Laurent Destailleur
980cb095da Fix sort order use last sortorder if several fields. 2020-10-29 11:05:43 +01:00
Florian Mortgat
5e2962ef38 FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines on a document 2020-10-29 10:50:13 +01:00
Laurent Destailleur
b1b7a7c725 Fix missing transaction 2020-10-29 10:40:50 +01:00
Laurent Destailleur
c3f0f3cc4a
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback" 2020-10-29 10:36:48 +01:00
Frédéric FRANCE
20c00d0c43
Update timeline.inc.php 2020-10-28 17:54:45 +01:00
Florian Mortgat
a4af2e94a9 FIX 10.0 - make formConfirm an addreplace-type hook 2020-10-28 17:08:09 +01:00
Laurent Destailleur
f02a35d398 Fix bad array when year is not defined into graph stat of products 2020-10-28 16:47:00 +01:00
Laurent Destailleur
6363a6cd60 Fix sanitize 2020-10-28 14:11:46 +01:00
Laurent Destailleur
47dfe633f9 Fix filter on date on statistics of products 2020-10-28 13:19:35 +01:00
Marc de Lima Lucio
a33d34a165 FIX: various payments: bad data handling for subledger account + useless db commit/rollback 2020-10-27 16:48:56 +01:00
Laurent Destailleur
5943e784ec Remove var_dump 2020-10-27 10:27:44 +01:00
Laurent Destailleur
00b49dba18 Fix label 2020-10-27 10:26:30 +01:00