Commit Graph

90157 Commits

Author SHA1 Message Date
Gurvan Kervern
1bd7b4a439 fix warnings 4
Fixing PHP8 warnings
2021-08-16 18:52:44 +08:00
Gurvan Kervern
f9c4ea8f6a fix warnings3
Fixing PHP8 warnings
2021-08-16 18:37:39 +08:00
Gurvan Kervern
d2e2dcf27e fix warnings 2
Fixing PHP8 warnings
2021-08-16 18:10:04 +08:00
Gurvan Kervern
b0ea9fed0a fix warnings 1
Removing all PHP8 warnings from error logs
2021-08-16 18:05:29 +08:00
Alexandre SPANGARO
1bfc0004b1 Better fix 2021-08-16 08:12:24 +02:00
Alexandre SPANGARO
ba12071ea3 FIX Accountancy - SQL error on select journal on journal 2021-08-16 07:57:40 +02:00
Alexandre SPANGARO
b8da594c31 Better fix 2021-08-16 05:47:25 +02:00
stickler-ci
b92fe38bc0 Fixing style errors. 2021-08-16 01:47:49 +00:00
stickler-ci
ee65860b27 Fixing style errors. 2021-08-16 01:45:33 +00:00
henrynopo
76c39a86a0
Supplier Invoice - Multicurrency remainder to pay
Added multicurrency remainder to be paid.
2021-08-16 09:44:09 +08:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay
Added the remainder to be paid in multicurrency mode.
2021-08-16 09:39:09 +08:00
Alexandre SPANGARO
abc94a397a FIX #18389 Accountancy - Bug on LDcompta10 export for supplier invoice 2021-08-15 11:12:14 +02:00
Alexandre SPANGARO
f88abb9a6f Add parenthesis 2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
0d467972cd Merge branch '12.0' into 12p18 2021-08-15 07:19:33 +02:00
atm-florian
1932bc308d FIX: e-mail of applicant is not transferred to the new user when creating a user from an applicant card 2021-08-13 13:26:11 +02:00
Vincent Dieltiens
2aef13c3b4 Adds global variable 'PRODUCT_GENERATE_REF_AFTER_FORM' to allow product ref generation after the form validation 2021-08-13 11:38:48 +02:00
Maxime Kohlhaas
96a820476c Fix supplier invoice clone : missing data on lines (#18055) 2021-08-13 10:45:43 +02:00
Gauthier PC portable 024
b2dad4d2ce Merge branch 'NEW/printFieldListFrom_on_commande_list' of github.com:atm-gauthier/dolibarr into NEW/printFieldListFrom_on_several_lists 2021-08-12 15:44:20 +02:00
Gauthier PC portable 024
22eda3fd63 NEW : add missing printFieldListFrom hook call on several lists 2021-08-12 15:39:52 +02:00
2125bc9aa5 CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment 2021-08-12 17:15:57 +04:00
84b8717693 CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
2021-08-12 17:05:00 +04:00
cd60d09d9e FIX #18399 Fix shipment validation email template override.
Object type name for shipment was apparently wrong.
2021-08-12 16:16:45 +04:00
Vincent Dieltiens
e691217d00 Add a Global variable 'PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES' to have the possibility to hide product label in supplier order lines. 2021-08-12 13:56:41 +02:00
Laurent Destailleur
896cdf4845
Update list.php 2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist 2021-08-11 22:22:26 +02:00
Laurent Destailleur
0d07135027
Update list.php 2021-08-11 22:19:53 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/pdf_other.php
2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 22:07:13 +02:00
Laurent Destailleur
745af0f025 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-08-11 21:54:35 +02:00
Laurent Destailleur
d66df5cb60 Complete #15548 2021-08-11 21:53:21 +02:00
Laurent Destailleur
0d2e3ece1a
Update card.php 2021-08-11 21:50:28 +02:00
Laurent Destailleur
3af8e18b3c
Create card.php 2021-08-11 21:47:28 +02:00
stickler-ci
3c0601d1f9 Fixing style errors. 2021-08-11 19:46:39 +00:00
Laurent Destailleur
5b30cf3e77
Update card.php 2021-08-11 21:44:18 +02:00
Laurent Destailleur
c36bb0fbf7
Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
stickler-ci
eadfc9f4ae Fixing style errors. 2021-08-11 19:36:18 +00:00
Laurent Destailleur
3befe8f383
Update 12.0.0-13.0.0.sql 2021-08-11 21:34:11 +02:00
Laurent Destailleur
80673e0efc
Update card.php 2021-08-11 21:32:39 +02:00
Laurent Destailleur
9e54dc0dcb typo 2021-08-11 21:31:14 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2021-08-11 21:06:33 +02:00
Laurent Destailleur
bf72143823 Fix phpcs 2021-08-11 21:04:03 +02:00
Laurent Destailleur
911f8daec6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 21:03:04 +02:00
Laurent Destailleur
06b50051f1
Merge pull request #18356 from altairisfr/iban
NEW: add constant MAIN_IBAN_IS_NEVER_MANDATORY
2021-08-11 21:02:51 +02:00
Laurent Destailleur
012eee7e06
Merge pull request #18317 from altairisfr/PROPAL_NOT_BILLABLE
NEW : add constant PROPOSAL_ARE_NOT_BILLABLE
2021-08-11 21:00:53 +02:00
lmarcouiller
51a28a4ac4 Fix lang error on hrm/index.php 2021-08-11 20:48:22 +02:00
Laurent Destailleur
bfedd4a04c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 20:47:51 +02:00
Laurent Destailleur
ec4a1d4cb7
Merge pull request #18344 from Hystepik/develop#4
Fix lang error on hrm/index.php
2021-08-11 20:47:35 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close
NEW #18326 Workflow: Close order on shipment closing.
2021-08-11 20:47:06 +02:00
Laurent Destailleur
ab3874a203
Merge pull request #18349 from cfoellmann/fix-stdvalue-target
add GETPOST to 'target' value on new bookmarks
2021-08-11 20:05:36 +02:00
Laurent Destailleur
687eb536ae
Update card.php 2021-08-11 20:05:03 +02:00
Laurent Destailleur
8e9d0a567a
Merge pull request #18360 from andreubisquerra/develop
NEW Customer Display with TakePOS
2021-08-11 20:00:36 +02:00
Laurent Destailleur
366332a6f5
Merge pull request #18347 from erikvanberkum/develop
Fix: Change French word to English in English array.
2021-08-11 19:59:21 +02:00
Laurent Destailleur
dad251493a
Merge pull request #18355 from marc-dll/12.0_FIX_holiday_card_hooks
FIX: holiday card: hooks uninitialized
2021-08-11 19:58:50 +02:00
Laurent Destailleur
5a0adfc80b
Merge pull request #18362 from fappels/15_update_actioncomm
Update actioncomm.class
2021-08-11 19:58:25 +02:00
Laurent Destailleur
34b53592b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Anthony Berton
d421d3d8e3
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-11 18:39:32 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name 2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13 CHANGE_CONST_ADD_DOC 2021-08-11 18:37:13 +02:00
Anthony Berton
fb42e3f473 add_doc 2021-08-11 18:25:48 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-11 18:17:58 +02:00
Anthony Berton
a8562704cf add_doc 2021-08-11 18:16:53 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-11 18:12:02 +02:00
Anthony Berton
e89c1b49a8 add_espadon_doc 2021-08-11 17:44:40 +02:00
Anthony Berton
c62c53bf5e add_sponge_doc 2021-08-11 17:42:43 +02:00
Anthony Berton
fc10fd0901 add_cyan_doc 2021-08-11 17:32:09 +02:00
Anthony Berton
8d1a53ce98 add eratosthene doc 2021-08-11 16:28:13 +02:00
Anthony Berton
5938f131c8 erreur cut past logo height mouve 2021-08-11 16:24:11 +02:00
Anthony Berton
3b356fc366 params is duplicate 2021-08-11 16:20:41 +02:00
Anthony Berton
c5e8302ba2 Const 2021-08-11 16:18:16 +02:00
Laurent Destailleur
1cdab44252
Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine
Remove strange check on hook printOriginObjectLine.
2021-08-11 15:55:55 +02:00
Laurent Destailleur
8da328b183
Update extrafields_list_search_sql.tpl.php 2021-08-11 15:44:48 +02:00
Laurent Destailleur
dd5f2dd3a2
Merge pull request #18370 from cfoellmann/fix-link-supplier
fix link to supplier card of thirdparty on supplier_order list
2021-08-11 15:44:00 +02:00
Laurent Destailleur
3964bd28db
Merge pull request #18385 from marc-dll/12.0_FIX_workflow_shipment_validate_trigger
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
2021-08-11 15:28:12 +02:00
Laurent Destailleur
065d7a781e
Merge branch 'develop' into PDF_Add_propal_option_paiment 2021-08-11 15:24:10 +02:00
stickler-ci
775164f84a Fixing style errors. 2021-08-11 15:21:14 +02:00
Anthony Berton
c12905f0f3 ok 2021-08-11 15:21:08 +02:00
Laurent Destailleur
094a11fae6
Merge pull request #18390 from bb2a/save__pdf_option_other
[FIX] PDF other options save Yes/No
2021-08-11 15:19:38 +02:00
Laurent Destailleur
6fbd93999f css 2021-08-11 13:33:51 +02:00
stickler-ci
3e2b4b45c1 Fixing style errors. 2021-08-11 11:00:11 +00:00
Anthony Berton
40329b9181 other_doc 2021-08-11 12:59:34 +02:00
Anthony Berton
967d526307 other_frame 2021-08-11 12:41:50 +02:00
Anthony Berton
b8ccbf39f3 other_doc 2021-08-11 12:39:24 +02:00
stickler-ci
b7441aaf45 Fixing style errors. 2021-08-11 10:37:06 +00:00
Anthony Berton
b45a57060f const_and_other_doc 2021-08-11 12:36:16 +02:00
Anthony Berton
816648f283 other_docs 2021-08-11 12:28:44 +02:00
stickler-ci
120ac51495 Fixing style errors. 2021-08-11 06:52:10 +00:00
stickler-ci
8f8ff50d35 Fixing style errors. 2021-08-11 06:50:50 +00:00
Laurent Destailleur
f48a9aa3ad Optimize size of html 2021-08-10 19:44:55 +02:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Laurent Destailleur
4faf6f5d84 Fix crlf 2021-08-10 19:28:06 +02:00
Anthony Berton
7acc5e22d0 Merge branch 'PDF_show_sender_name' of https://github.com/bb2a/dolibarr into PDF_show_sender_name 2021-08-10 18:08:00 +02:00
Anthony Berton
be016197b4 Trans 2021-08-10 18:07:11 +02:00
Anthony Berton
bcb58ae6ef trans 2021-08-10 18:06:35 +02:00
Anthony Berton
2cb7e828a3 Trans 2021-08-10 18:05:58 +02:00
Anthony Berton
69e31e1655 ok 2021-08-10 18:04:59 +02:00
Anthony Berton
005e25375a ok 2021-08-10 17:51:39 +02:00
Gauthier PC portable 024
087e269103 FIX : on supplier order, JOIN with product fourn price table must be done with fk_soc too to avoid display several times a same line (because of same supplier product ref) 2021-08-10 17:34:47 +02:00
stickler-ci
1d9d90036d Fixing style errors. 2021-08-10 15:14:41 +00:00
Erik van Berkum
c05b1f5e29
Merge branch 'Dolibarr:develop' into develop 2021-08-10 23:59:50 +09:00
Laurent Destailleur
5e0aaeb6e4 Fix warning 2021-08-10 16:40:33 +02:00
Laurent Destailleur
2860c5e3ab Fix missing dir 2021-08-10 16:36:54 +02:00
Laurent Destailleur
bef0989b15 Missing declaration 2021-08-10 13:34:21 +02:00
Anthony Berton
fb81db9426 yes/no save 2021-08-10 13:34:12 +02:00
Anthony Berton
21d6b9834a yes/no save 2021-08-10 13:31:25 +02:00
Anthony Berton
133bb0e699 yes/no save 2021-08-10 13:28:36 +02:00
Anthony Berton
a5accb8c3c yes/no 2021-08-10 13:18:07 +02:00
Laurent Destailleur
31d6aaf6b4 FIX avoid to have link to create bookmar on page to create bookmark 2021-08-10 13:06:57 +02:00
Anthony Berton
6a41edd3c2 ok 2021-08-10 13:02:37 +02:00
Laurent Destailleur
6ece5f6931 FIX avoid to have link to create bookmar on page to create bookmark 2021-08-10 13:01:57 +02:00
Laurent Destailleur
93fb6bce71 css 2021-08-10 12:26:41 +02:00
Laurent Destailleur
3b73abed7c css 2021-08-10 11:40:25 +02:00
Marc de Lima Lucio
b610cc1c6c FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object 2021-08-10 11:18:25 +02:00
Marc de Lima Lucio
08f21e3fc4 FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts 2021-08-10 10:23:56 +02:00
Anthony Berton
366625f300 const 2021-08-10 09:50:14 +02:00
stickler-ci
fcd174f3ad Fixing style errors. 2021-08-10 07:45:47 +00:00
Anthony Berton
f8df845442 Const and Com 2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f const 2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152 CONST 2021-08-10 09:38:07 +02:00
Laurent Destailleur
f3dbe81df4 FIX Can't set cost price when product is not on purchase 2021-08-09 20:02:24 +02:00
Laurent Destailleur
6a9217474d FIX Can't set cost price when product is not on purchase 2021-08-09 20:01:06 +02:00
Laurent Destailleur
3f58e7c5db Debug status of partnership 2021-08-09 18:31:34 +02:00
Anthony Berton
0bead55836 ok 2021-08-09 18:11:36 +02:00
stickler-ci
adc6f883e2 Fixing style errors. 2021-08-09 16:03:13 +00:00
Anthony Berton
6b3b6fd508 ok 2021-08-09 18:01:43 +02:00
Laurent Destailleur
b5b53e382e Fix missing template 2021-08-09 18:01:41 +02:00
Laurent Destailleur
2c5e0a595b Fix init data missing 2021-08-09 17:58:08 +02:00
Laurent Destailleur
e91c5fc1c5 Clean code 2021-08-09 17:55:26 +02:00
Laurent Destailleur
0876cb4cd9 Fix button cancel 2021-08-09 17:46:36 +02:00
stickler-ci
190ae8377e Fixing style errors. 2021-08-09 15:42:38 +00:00
Anthony Berton
41457d2adb ok 2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
6e4fb8dd8b Fix debited instead of credited for bank transfer sepa status 2021-08-09 16:48:36 +02:00
Laurent Destailleur
739d8e1c6b Fix data structure 2021-08-09 16:19:23 +02:00
Laurent Destailleur
305314c04e Fix data structure 2021-08-09 16:18:33 +02:00
Laurent Destailleur
2de728c074 Fix trans 2021-08-09 16:12:20 +02:00
Christian Foellmann
e4cb1e023a fix link to supplier card of thirdparty on supplier_order list 2021-08-09 15:39:04 +02:00
Quentin VIAL-GOUTEYRON
108a5ff7cb FIX postgre filter select search extrafield 2021-08-09 15:14:25 +02:00
Francis Appels
91ef2a44fd Remove strange check on hook printOriginObjectLine.
Now need reshook.
2021-08-09 11:17:11 +02:00
andreubisquerra
ea531a4c88
Customer display settings 2021-08-08 19:16:11 +02:00
andreubisquerra
8a513ea468
Customer display on addline 2021-08-08 19:15:18 +02:00
andreubisquerra
bae5b39706
Customer display on click product 2021-08-08 19:14:28 +02:00
andreubisquerra
49b53e04f4
Customer Display total on pay 2021-08-08 19:13:31 +02:00
andreubisquerra
091f5ab23b
Customer Display Lang 2021-08-08 19:12:45 +02:00
Laurent Destailleur
6b1fc48bd0 Fix var not initialized 2021-08-08 18:22:09 +02:00
Laurent Destailleur
671baa261d Fix var not defined 2021-08-08 12:57:00 +02:00
Laurent Destailleur
029da815b2 Code comment 2021-08-08 12:35:52 +02:00
Laurent Destailleur
47d57b1ed2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-08 12:23:44 +02:00
Laurent Destailleur
78e993c9f3 Fix permission to read reports 2021-08-08 12:23:14 +02:00
Laurent Destailleur
7247b99170 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-08 12:15:25 +02:00
Laurent Destailleur
28ff7c894b Fix missing permission 2021-08-08 12:14:40 +02:00
Laurent Destailleur
227f1605f6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/group/perms.php
2021-08-08 12:10:21 +02:00
Laurent Destailleur
c377e5ea3d Fix undefined method 2021-08-08 12:09:18 +02:00
Laurent Destailleur
7365d61dfc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-08 12:05:45 +02:00
Laurent Destailleur
3f0a5cc689 Fix permission info on permissions group 2021-08-08 12:04:21 +02:00
Laurent Destailleur
948663deb4 Fix deprecated var 2021-08-07 13:59:07 +02:00
Laurent Destailleur
1435172405 Better help 2021-08-06 18:55:41 +02:00
Laurent Destailleur
354d88df23 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-06 18:50:39 +02:00
Laurent Destailleur
d437d382d8 Fix trans 2021-08-06 18:48:05 +02:00
Francis Appels
68482c637b Update actioncomm.class
Property contactid should be contact_id
2021-08-06 18:45:25 +02:00
Laurent Destailleur
a7fa238b71 Position of option 2021-08-06 18:35:16 +02:00
Laurent Destailleur
e26eda3f5f Position of option 2021-08-06 18:34:35 +02:00
Laurent Destailleur
458f773baf Fix security options 2021-08-06 18:32:40 +02:00
Christophe Battarel
cbc7589559 NEW: add constant MAIN_IBAN_NOT_MANDATORY 2021-08-06 16:35:49 +02:00
Marc de Lima Lucio
864a8b4b3e FIX: holiday card: hooks uninitialized 2021-08-06 16:22:19 +02:00
Laurent Destailleur
fec5a22c65 Fix filter to find files of a ref. 2021-08-06 13:26:01 +02:00
Laurent Destailleur
4c3c613568 Fix filter to find files of a ref. 2021-08-06 13:24:40 +02:00
Laurent Destailleur
cf74af4401 css 2021-08-06 13:07:07 +02:00
Laurent Destailleur
c0c46fb704 FIX Link of download main doc on vat list 2021-08-06 12:20:12 +02:00
Laurent Destailleur
6cefd0a756 FIX Link of download main doc on vat list 2021-08-06 12:18:51 +02:00
Laurent Destailleur
470eec7f50 Remove (hide) not used field "deductible" on social contributions. 2021-08-06 11:32:39 +02:00
Christian Foellmann
80c63cae5e add GETPOST to 'target' value on new bookmarks -> allows to set default value 2021-08-06 08:32:40 +02:00
Erik van Berkum
d249ffd5ad Fix: Change French word to English in English array. 2021-08-06 13:40:19 +09:00
lmarcouiller
6b20b32f07 Fix lang error on hrm/index.php 2021-08-05 16:31:21 +02:00
Laurent Destailleur
591b8acd51 FIX show info of company into user dropdown 2021-08-05 15:57:51 +02:00
Laurent Destailleur
c603dfb5ea Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-05 15:16:04 +02:00
Laurent Destailleur
fca3980dce FIX Can't remove a permission of a group 2021-08-05 15:15:03 +02:00
Laurent Destailleur
047bbbb298 NEW Can set/unset the usual working day of the week 2021-08-05 14:42:28 +02:00
Laurent Destailleur
5d717113be Add language key 2021-08-05 11:20:43 +02:00
Laurent Destailleur
0a31f3dc1a FIX #18341 lang not loaded 2021-08-04 23:11:59 +02:00
Laurent Destailleur
965bdbb342 Trans 2021-08-04 23:08:57 +02:00
Laurent Destailleur
f6abeca246 Fix example 2021-08-04 20:18:14 +02:00
Laurent Destailleur
76038e692d NEW Use an ajax call for the clicktodial feature instead of href link. 2021-08-04 20:07:12 +02:00
stickler-ci
ee55a7de5a Fixing style errors. 2021-08-04 15:50:59 +00:00
Gauthier PC portable 024
7b702d19d4 NEW : display shipping method and tracking url on shipemnt list 2021-08-04 17:47:40 +02:00
Hystepik
e02d93c401
Merge branch 'develop' into develop#1 2021-08-04 16:15:50 +02:00
Laurent Destailleur
a5d11a1ccf Fix warning 2021-08-04 15:46:00 +02:00
Laurent Destailleur
0de10cea39 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 15:21:31 +02:00
Laurent Destailleur
ba403dd33f Add missing security info 2021-08-04 15:21:01 +02:00
Laurent Destailleur
c60927da61 Add missing security info 2021-08-04 15:16:51 +02:00
lmarcouiller
8c8a542127 fix error with lang search 2021-08-04 15:06:08 +02:00
Maxime Kohlhaas
803722e323 Fix : we only want employee users for holidays 2021-08-04 14:48:10 +02:00
Laurent Destailleur
841176fdfd Fix set cookie with tag "secure" when https is forced. 2021-08-04 14:38:05 +02:00
Laurent Destailleur
58ca982e55 Fix trans 2021-08-04 14:01:57 +02:00
Laurent Destailleur
a9ced1098d Fix lang loaded 2021-08-04 13:51:54 +02:00
Laurent Destailleur
928a2154b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:22:55 +02:00
Laurent Destailleur
23ea8d2907 Fix link into message 2021-08-04 13:22:24 +02:00
Laurent Destailleur
354b8aab01 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:18:33 +02:00
Laurent Destailleur
de228c5687 Fix bad link. Can't delete SEPA bank transfer request 2021-08-04 13:18:03 +02:00
Laurent Destailleur
6a31d4657b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:12:46 +02:00
Laurent Destailleur
bec87f5739 Fix translation ICS 2021-08-04 13:12:07 +02:00
Laurent Destailleur
2f3105d884 Add CSRF protection 2021-08-04 13:05:07 +02:00
Laurent Destailleur
a84c994368 Fix no tooltip on link in error message 2021-08-04 12:43:36 +02:00
Laurent Destailleur
bf49309d58 Fix css 2021-08-04 12:41:27 +02:00
Laurent Destailleur
ce0d9f3b17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 12:38:56 +02:00
Laurent Destailleur
aaefb7b324 Fix css 2021-08-04 12:38:28 +02:00
Laurent Destailleur
6dc8024d87 Fix title 2021-08-04 12:30:48 +02:00
Laurent Destailleur
d1af127c81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 12:29:11 +02:00
Laurent Destailleur
4dfc8bab93 Fix bad title 2021-08-04 12:28:13 +02:00
Laurent Destailleur
4958015e93 Fix token 2021-08-04 12:26:38 +02:00
lmarcouiller
8cbbcc01a9 Update to make lan field common 2021-08-04 11:25:23 +02:00
Laurent Destailleur
6c19524fd7 code comment 2021-08-04 00:12:49 +02:00
Laurent Destailleur
7245fcec11 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 00:09:51 +02:00
Laurent Destailleur
5f5734e9af css 2021-08-04 00:09:33 +02:00
Laurent Destailleur
a571fab177 css 2021-08-03 23:54:36 +02:00
Laurent Destailleur
ea6cfeb0e8 NEW Increase size of params of action for emailcollector 2021-08-03 19:21:18 +02:00
Laurent Destailleur
5ec3245119 Migration 2021-08-03 17:15:55 +02:00
Laurent Destailleur
d3515253b2
Update 13.0.0-14.0.0.sql 2021-08-03 17:15:13 +02:00
Laurent Destailleur
78358d4ea1
Merge pull request #18190 from frederic34/migration_cat_tickets
add categories tickets migration
2021-08-03 17:13:06 +02:00
Laurent Destailleur
5becf13f2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-03 17:09:09 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2021-08-03 17:08:49 +02:00
Laurent Destailleur
d3fa85cdb4
Merge pull request #18324 from Hystepik/develop#4
Close #18043 : fk_user_assign in create ticket
2021-08-03 17:06:55 +02:00
Laurent Destailleur
892ec3a661
Update card.php 2021-08-03 17:06:07 +02:00
Laurent Destailleur
1c981ccb9d Fix look and feel v14 2021-08-03 17:03:34 +02:00
Laurent Destailleur
1a0eeaf701 Fix phpcs 2021-08-03 16:35:47 +02:00
stickler-ci
1da9829d61 Fixing style errors. 2021-08-03 14:08:23 +00:00
lmarcouiller
6e68bf10ef Update of card.php to change status 2021-08-03 16:06:08 +02:00
4873a91afc CLOSE #18326 Workflow: Close order on shipment closing.
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
2021-08-03 17:55:28 +04:00
Laurent Destailleur
9ceab9b86b Doc 2021-08-03 15:47:00 +02:00
Christophe Battarel
f00694470f rename constant to PROPOSAL_ARE_NOT_BILLABLE 2021-08-03 15:40:01 +02:00
Laurent Destailleur
ce38ccc121
Merge pull request #18184 from ksar-ksar/patch-5
FIX #18181
2021-08-03 15:35:20 +02:00
Laurent Destailleur
070fc26dcb
Merge pull request #18309 from grandoc/new_branch_02_08_2021
New branch 02 08 2021
2021-08-03 15:31:25 +02:00
Florian HENRY
19f17ed114 fix: bad setEventMessages input 2021-08-03 15:30:36 +02:00
Laurent Destailleur
c40cc3a51e
Merge pull request #18194 from FHenry/fix_bad_eoordisplay
fix: bad setEventMessages input
2021-08-03 15:23:22 +02:00
Laurent Destailleur
29715c2f2e
Merge pull request #18318 from altairisfr/PROPAL_REOPEN_UNSIGNED_ONLY
NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY
2021-08-03 15:09:31 +02:00
Laurent Destailleur
115b0e6831
Update api_shipments.class.php 2021-08-03 15:07:16 +02:00
lmarcouiller
c8fd7ccbb6 Close #18043 : fk_user_assign in create ticket 2021-08-03 15:06:53 +02:00
Laurent Destailleur
8b746b64a0 Prepare 14.0.1 2021-08-03 15:04:29 +02:00
Laurent Destailleur
ce5acda635 Fix phpcs 2021-08-03 15:03:41 +02:00
Laurent Destailleur
5543d68e5a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-03 15:02:24 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
d1f9762ca9 CLOSE #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
Allow "closing" a shipment through the REST API.
2021-08-03 13:37:28 +04:00
Christophe Battarel
7a7287489d NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY 2021-08-03 11:24:21 +02:00
Christophe Battarel
2998c94884 NEW : add constant PROPAL_NOT_BILLABLE 2021-08-03 11:12:19 +02:00
Laurent Destailleur
cad39cc75d
Merge pull request #18307 from dolibit-ut/patch-366
Update llx_c_actioncomm.sql
2021-08-02 20:21:34 +02:00
Laurent Destailleur
000c32c137 FIx #18313 2021-08-02 20:20:52 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
atm-florian
fc33d46c77 FIX: using Tulip, deposit mask doesn't get saved 2021-08-02 18:56:45 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Laurent Destailleur
61e3a57de7 Fix label 2021-08-02 18:23:05 +02:00
Laurent Destailleur
efda27000e Fix set of date of rum signature 2021-08-02 18:13:35 +02:00
Laurent Destailleur
8077fae42e Code comment 2021-08-02 17:56:58 +02:00
Laurent Destailleur
04fc2c0ce7 css 2021-08-02 17:49:27 +02:00
lmarcouiller
1cef6d31e8 Close #18302 : Mass action leave requests 2021-08-02 15:45:55 +02:00
Philippe GRAND
3c05cd0757 fix typo and translation 2021-08-02 12:41:55 +02:00
Philippe GRAND
703217acd0 backward 2021-08-02 12:39:45 +02:00
Philippe GRAND
3acb304dd3 fix typo and translation 2021-08-02 12:35:46 +02:00
UT from dolibit
b801188801
Update llx_c_actioncomm.sql 2021-08-02 12:12:57 +02:00
Frédéric FRANCE
099164c043
Merge remote-tracking branch 'upstream/develop' into migration_cat_tickets 2021-08-02 09:01:27 +02:00
Laurent Destailleur
c6233e4a39
Merge pull request #18165 from trekmorris/patch-3
Update opensurvey.lang manually
2021-08-02 00:03:38 +02:00
Laurent Destailleur
a4843f7d10
Merge pull request #18176 from ATM-Consulting/FIX_13.0_dispatch_cloned_datepicker_not_working
FIX: datepickers cloned using jquery are not working
2021-08-01 23:51:57 +02:00
Laurent Destailleur
7ab129d489
Merge pull request #18179 from joseplluis/patch-8
Add missing line product variables
2021-08-01 23:47:56 +02:00
Laurent Destailleur
b725dd0309
Merge pull request #18186 from frederic34/patch-8
fix variable
2021-08-01 23:46:42 +02:00
Laurent Destailleur
d8a9a0cfb8
Merge pull request #18188 from frederic34/patch-11
fix php8 warnings
2021-08-01 23:42:17 +02:00
Laurent Destailleur
3ca1e1c4c0
Merge pull request #18196 from FHenry/develop_addexport
new: add column into export invoice
2021-08-01 23:32:51 +02:00
Laurent Destailleur
957b373ecd
Merge pull request #18200 from frederic34/notify
notify class indent
2021-08-01 23:27:49 +02:00
Laurent Destailleur
e8d385ae42
Merge pull request #18224 from aspangaro/14p9
FIX: Missing column Date validation in ledger & subledger
2021-08-01 23:26:25 +02:00
Laurent Destailleur
7f28ad325b
Merge pull request #18208 from dolibit-ut/patch-364
Update llx_00_c_country.sql
2021-08-01 14:55:29 +02:00
Laurent Destailleur
a983dc7506
Merge pull request #18214 from FHenry/12_fix_css_form_confirmlist
fix: since commit be62c2f7 selectlist from formconfirm were behind form confirm
2021-08-01 14:53:08 +02:00
Laurent Destailleur
5256d6e046 css 2021-07-31 17:34:41 +02:00
Laurent Destailleur
b67487b2ca Fix reposition 2021-07-31 17:28:43 +02:00
Laurent Destailleur
7eb8232b75 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-31 17:21:05 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +02:00
Laurent Destailleur
b332d02d20
Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel
NEW add agenda auto creation on supplier_order cancellation
2021-07-31 17:02:08 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Laurent Destailleur
85a02c5615
Merge pull request #18288 from FHenry/14_deveventorg
NEW: EventOrganization Module #FoundationFunding
2021-07-31 16:57:07 +02:00
Laurent Destailleur
530a773eaa
Merge pull request #18300 from cfoellmann/fix-tomail-field
fix `tomail` param in mail form usage
2021-07-31 16:55:01 +02:00
Laurent Destailleur
af95169d1d
Update actions_sendmails.inc.php 2021-07-31 16:54:18 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
f73394435e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/expensereport/card.php
	htdocs/societe/list.php
2021-07-31 16:32:24 +02:00
Laurent Destailleur
9811569b2b FIX #18289 #18294 2021-07-31 16:22:50 +02:00
Laurent Destailleur
0c024ca96b
Merge pull request #18297 from cfoellmann/hook-menu
NEW add hook 'menuLeftMenuItems' to filter the leftmenu items
2021-07-31 16:13:49 +02:00
Laurent Destailleur
1e8f27975d
Merge pull request #18207 from dolibit-ut/patch-363
Update llx_20_c_departements.sql
2021-07-31 13:30:53 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2
New : Inventory scanner tool implemented
2021-07-31 13:27:18 +02:00
Laurent Destailleur
58fa6ac4ab
Merge pull request #18215 from netdrag/order_supplier_email_sender-patch-1
Order Supplier Email Sender Extension
2021-07-31 12:29:49 +02:00
Laurent Destailleur
04911bde25
Merge pull request #18277 from atm-florianm/FIX_forum_post_37369_wrong_conf_used
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-31 12:20:18 +02:00
Laurent Destailleur
b77ec22590
Merge pull request #18278 from aspangaro/12p17
FIX: Invoice - Missing button to reopen an abandoned situation invoice
2021-07-31 12:19:26 +02:00
Laurent Destailleur
6f5e412bd5
Merge pull request #18299 from Hystepik/develop_v14#3
Fix error in website module -> sitemap v14
2021-07-31 12:15:42 +02:00
Laurent Destailleur
9dc61adcc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-30 18:44:15 +02:00
Laurent Destailleur
9c626bede4 Fix dol_hash for sha256 2021-07-30 18:43:35 +02:00
Christian Foellmann
f830a0f5e2 fix tomail param in mail form usage 2021-07-30 15:20:41 +02:00
Laurent Destailleur
5995e01bd1
Merge pull request #18280 from ptibogxiv/patch-439
Fix for php 8
2021-07-30 15:19:54 +02:00
Christian Foellmann
055a5c4ab6 fix hook name 2021-07-30 15:19:05 +02:00
lmarcouiller
0d70c81897 ix error in website module -> sitemap 2021-07-30 15:16:38 +02:00
Laurent Destailleur
a9f5fd497a
Merge pull request #18291 from FHenry/14_fix_add_missing_hook_translationproductpage
fix: add hook management into product translation tab
2021-07-30 15:07:01 +02:00
atm-florian
63898426d2 FIX: on admin/pdf.php (with javascript enabled) if you set some boolean confs then click on "save", all boolean values are reset 2021-07-30 13:36:54 +02:00
stickler-ci
3ceb451734 Fixing style errors. 2021-07-30 11:19:18 +00:00
Christian Foellmann
0102e73306 add hook 'menu_LeftMenuArray' to filter the leftmenu items 2021-07-30 13:15:01 +02:00
Florian HENRY
8ea6fc3174 fix: add hook management into product translation tab 2021-07-30 09:38:29 +02:00
Florian HENRY
510cf36bbd Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-30 09:26:55 +02:00
Laurent Destailleur
57d637ac71 Fix set status of a ticket 2021-07-30 01:49:43 +02:00
Laurent Destailleur
047c575d61 Fix some errors on ticket module 2021-07-30 01:42:52 +02:00
Laurent Destailleur
593e84906b FIX bad closing div on error message 2021-07-30 01:16:04 +02:00
Laurent Destailleur
0c3bf536f2 Fix field resolution 2021-07-30 01:10:15 +02:00
Laurent Destailleur
9954a0e4bb Fix status of tickets 2021-07-30 00:40:06 +02:00
Laurent Destailleur
26a7130376 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-29 23:48:28 +02:00
Laurent Destailleur
f02dee2e21 Fix test on missing install.lock 2021-07-29 23:47:59 +02:00
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Maxime Kohlhaas
12b2ba64eb Fix right check on thirdparty set on ticket card 2021-07-29 17:49:37 +02:00
Florian HENRY
78646d10bb tpl object linked 2021-07-29 17:26:17 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Alexandre SPANGARO
ca6dd8850a FIX: Manage credit note on situation invoice for calculate margin 2021-07-29 15:24:08 +02:00
Christian Foellmann
b5c30126cb extend the hook getElementList to make $ids in the hooked function 2021-07-29 14:49:41 +02:00
ptibogxiv
da482018d2
Fix for php 8 2021-07-29 10:51:51 +02:00
Christian Foellmann
8d87bdcf7e add sql data for fresh install 2021-07-29 08:18:55 +02:00
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel 2021-07-29 08:14:02 +02:00
Alexandre SPANGARO
262dd1600b FIX: Invoice - Missing button to reopen an abandoned situation invoice 2021-07-29 06:23:12 +02:00
atm-florian
fdd0ab8461 FIX $conf->task used but it does not exist, use $conf->projet instead 2021-07-28 23:56:44 +02:00
Laurent Destailleur
583f1ccc1a
Merge pull request #18243 from Robin-Yann/13-hook
13 - add hook product part
2021-07-28 22:46:20 +02:00
Francis Appels
f6d03fe28e Fix update product lot 2021-07-28 21:45:11 +02:00
Laurent Destailleur
9734fced56
Merge pull request #18221 from aspangaro/14p8
FIX: Accountancy - Search date on journal
2021-07-28 19:48:38 +02:00
Josep Lluís
e7af8e9d5e FIX totalDayAll hours in tasks
The extra days hours were not considered in total hours
2021-07-28 19:40:33 +02:00
Frédéric FRANCE
ae5d17815f Update dolreceiptprinter.class.php 2021-07-28 19:39:17 +02:00
Laurent Destailleur
9b73fac947
Merge pull request #18245 from frederic34/patch-12
Update dolreceiptprinter.class.php
2021-07-28 19:38:29 +02:00
Laurent Destailleur
e406d80338
Merge pull request #18233 from ptibogxiv/patch-431
fix for php8
2021-07-28 19:37:00 +02:00
Laurent Destailleur
d2311bcdeb
Merge pull request #18234 from ptibogxiv/patch-432
fix for php 8
2021-07-28 19:36:13 +02:00
Laurent Destailleur
03ac579b64
Merge pull request #18241 from FHenry/fix_numbertotext_ndf
fix: expense report line, on update qty must/can be decimal
2021-07-28 19:31:16 +02:00
Laurent Destailleur
07c4c36520
Merge pull request #18271 from Hystepik/develop_v14#2
Fix a bug in ecm for v14
2021-07-28 19:16:33 +02:00
Laurent Destailleur
20217806c6
Merge pull request #18227 from Hystepik/develop_v13#1
Fix #18185 : Filter fk_stcomm fixed
2021-07-28 19:11:04 +02:00
Laurent Destailleur
fea4210570
Merge pull request #18272 from laurantines/patch-3
Fix opp status required even if PROJECT_USE_OPPORTUNITIES off
2021-07-28 18:57:03 +02:00
Laurent Destailleur
c9a46ab0cc
Merge pull request #18273 from aspangaro/12p17
FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT)
2021-07-28 18:55:47 +02:00
ptibogxiv
99e256a417
Update functions.lib.php 2021-07-28 18:22:26 +02:00
Josep Lluís
20add7d3fc
FIX totalDayAll hours in tasks
The extra days hours were not considered in total hours
2021-07-28 18:02:55 +02:00
Laurent Destailleur
57b18a6bed
Merge pull request #18218 from aspangaro/14p6
Security
2021-07-28 17:55:54 +02:00
Laurent Destailleur
512b2477ef
Merge pull request #18225 from aspangaro/14p10
FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger
2021-07-28 17:43:49 +02:00
Laurent Destailleur
bd731d9213
Merge pull request #18226 from FHenry/fix_addtimespend
FIX: cannot add time spend when column ref is not displayed
2021-07-28 17:38:04 +02:00
Laurent Destailleur
2b2c8f076b
Merge pull request #18231 from ptibogxiv/patch-429
Fix for php 8
2021-07-28 17:37:07 +02:00
Laurent Destailleur
fe2d229ba9
Merge pull request #18235 from ptibogxiv/patch-433
Fix for php8
2021-07-28 17:35:01 +02:00
Laurent Destailleur
686c10e5be
Merge pull request #18236 from ptibogxiv/patch-434
Fix for php8
2021-07-28 17:31:45 +02:00
Laurent Destailleur
29a61164fe
Merge pull request #18237 from ptibogxiv/patch-435
Fix subscription list
2021-07-28 17:30:42 +02:00
Laurent Destailleur
0476b36c6c
Merge pull request #18238 from ptibogxiv/patch-436
Fix for php8
2021-07-28 17:29:54 +02:00
Laurent Destailleur
8e16396d51
Merge pull request #18239 from ptibogxiv/patch-437
fix for php8
2021-07-28 17:29:32 +02:00
Laurent Destailleur
12a0029fb7
Merge pull request #18240 from ptibogxiv/patch-438
Fix for php 8
2021-07-28 17:28:49 +02:00
Alexandre SPANGARO
cd63ede35a Correctif date 2021-07-28 16:46:57 +02:00
laurantines
f8563ace0d
Fix opp statusbrequires even if PROJECT_USE_OPPORTUNITIES off
If I modify a project and do not have PROJECT_USE_OPPORTUNITIES enabled, I cannot change the project budget. I get the error message that ErrorOppStatusRequiredIfAmount. However, I do not have the opportunities enabled and it does not make sense for that message to appear when I have not added any opportunities.
2021-07-28 16:14:38 +02:00
Laurent Destailleur
212f157c0f
Merge pull request #18246 from FHenry/fix_ref_fourn_size
new: ref fourn and ref customer same size as ref product
2021-07-28 16:00:45 +02:00
lmarcouiller
df8f099857 Fix a bug in ecm for v14 2021-07-28 15:57:12 +02:00
Laurent Destailleur
9dc45ac6ec
Merge pull request #18251 from cfoellmann/improve-makeorder
Improve makeorder
2021-07-28 15:41:09 +02:00
Laurent Destailleur
ae2866ccd7
Merge pull request #18269 from ksar-ksar/patch-6
FIX #18267
2021-07-28 15:38:17 +02:00
Laurent Destailleur
ededf43565
Merge pull request #18252 from cfoellmann/improve-receive
NEW add cancel button to `classifyreception` form on supplier_orders
2021-07-28 15:37:14 +02:00
Laurent Destailleur
8dca7d2b35
Merge pull request #18260 from FHenry/fix_addhook_addmoractionbutton_productprice
fix: add hook addMoreActionButton product price
2021-07-28 15:30:37 +02:00
Laurent Destailleur
7c86a4766e
Merge pull request #18261 from fmarcet/14.0
Fix: Price level on company list not filtering
2021-07-28 15:29:15 +02:00
ksar
2054cca6e5
FIX #18267 2021-07-28 15:14:18 +02:00
Alexandre SPANGARO
7acebd28ca Add information 2021-07-28 14:08:53 +02:00
kamel
b4ccb1b355 Corrections stickler-ci 2021-07-28 12:29:17 +02:00
kamel
2cd7513936 NEW: add link to a element by ref 2021-07-28 12:18:35 +02:00
kamel
95ecbb8940 FIX: add include missing file '/core/actions_dellink.inc.php' in project card 2021-07-28 12:05:46 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +02:00
Ferran Marcet
ea1c23b562 Merge branch '14.0up' into 14.0 2021-07-28 11:50:40 +02:00
Ferran Marcet
aae64eee1e Fix: Not correct redirect link on lots 2021-07-28 11:48:38 +02:00
Laurent Destailleur
a635e82406
Merge pull request #18254 from leninrivas/patch-2
Add filter select company
2021-07-28 11:22:16 +02:00
Ferran Marcet
2980cd9ab2 Fix: Price level on company list not filtering 2021-07-28 11:19:21 +02:00
Laurent Destailleur
3e9e47d4bd
Merge pull request #18255 from ksar-ksar/patch-6
FIX of #18212 : Add url field
2021-07-28 11:17:18 +02:00
Florian HENRY
84d221988f fix: add hook addMoreActionButton product price 2021-07-28 11:17:07 +02:00
Christian Foellmann
0cd8527c35 longer field for project ref on create and edit 2021-07-28 11:01:38 +02:00
Ferran Marcet
67cc580797 Fix: Bad rights on inventory module 2021-07-28 10:45:47 +02:00
Frédéric FRANCE
42252abc07
remove debug 2021-07-28 10:14:57 +02:00
ksar
3e3751e161
Add url field
#18212
2021-07-27 22:13:19 +02:00
Lenin Rivas
6038ef6bba
Add filter select company
Add filter with name alias and tva intra
2021-07-27 12:28:18 -05:00
Christian Foellmann
51cfeddaaf add cancel button to classifyreception form on supplier_orders 2021-07-27 16:51:14 +02:00
Christian Foellmann
d9529f2600 save makeorder comment to agenda item 2021-07-27 16:37:34 +02:00
Christian Foellmann
cefbcf03f6 fix cancel on makeorder (supplier_order) 2021-07-27 16:18:06 +02:00
Christian Foellmann
8b118670c3 fix agenda item refuse 2021-07-27 15:11:13 +02:00
Christian Foellmann
faf50a5aaa add agenda auto creation on supplier_order cancellation 2021-07-27 15:06:28 +02:00
Florian HENRY
f4fd4d8e7d new: ref fourn and ref customer same size as ref product 2021-07-27 12:09:04 +02:00
Frédéric FRANCE
bc8be62809
Update dolreceiptprinter.class.php 2021-07-27 10:26:51 +02:00
Robin
d2dc2bfde2 add hook product composition 2021-07-27 09:13:50 +02:00
Robin
a386cf5e89 add hook product stat 2021-07-27 09:09:42 +02:00
Florian HENRY
a7f55f4778 fix: Expense report line, on update qty can be decimal 2021-07-26 15:43:57 +02:00
ptibogxiv
54c151916d
Fix for php 8 2021-07-26 15:42:43 +02:00
ptibogxiv
053d72c306
fix for php8 2021-07-26 15:37:36 +02:00
ptibogxiv
3cb56d3ec6
Fix for php8 2021-07-26 15:35:31 +02:00
ptibogxiv
76f0bac703
Fix subscription list 2021-07-26 15:29:46 +02:00
ptibogxiv
f83f02e4e2
Fix for php8 2021-07-26 15:24:58 +02:00
ptibogxiv
36ba5c6a71
Fix for php8 2021-07-26 15:22:50 +02:00
ptibogxiv
dc30052d3e
fix for php 8 2021-07-26 15:07:52 +02:00
stickler-ci
986dc9c857 Fixing style errors. 2021-07-26 13:06:42 +00:00
ptibogxiv
4fa72f7dfe
fix for php8 2021-07-26 15:04:43 +02:00
ptibogxiv
b0e2ef4a6c
Update extrafields_edit.tpl.php 2021-07-26 14:53:18 +02:00
ptibogxiv
026e61f1ec
Update extrafields_edit.tpl.php 2021-07-26 14:53:06 +02:00
ptibogxiv
d443485939
Update extrafields_edit.tpl.php 2021-07-26 14:52:24 +02:00
ptibogxiv
a181469ff8
Update type.php 2021-07-26 14:34:45 +02:00
ptibogxiv
cfdcad0077
Update type.php 2021-07-26 14:30:38 +02:00
ptibogxiv
a08b63d561
Fix for php 8 2021-07-26 14:29:42 +02:00
lmarcouiller
b5dde982d5 Fix #18185 : for v13 2021-07-26 10:32:51 +02:00
Florian HENRY
a7cef1aa15 FIX: cannot add time spend when column ref is not displayed 2021-07-26 10:20:11 +02:00
Alexandre SPANGARO
35862cebfa Fix card presentation 2021-07-26 04:49:56 +02:00
Alexandre SPANGARO
183d413b45 FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger 2021-07-26 04:42:35 +02:00
Alexandre SPANGARO
bbd84fd13e FIX: Missing column Date validation in ledger & subledger 2021-07-26 04:08:05 +02:00
Laurent Destailleur
079b014b14 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e Fix #yogosha6704 2021-07-26 00:37:47 +02:00
Alexandre SPANGARO
84e5773de8 FIX: Accountancy - Search date on journal 2021-07-25 22:37:20 +02:00
Alexandre SPANGARO
5453e3b3b2 Security 2021-07-25 08:35:03 +02:00
stickler-ci
5524320fbc Fixing style errors. 2021-07-23 17:46:44 +00:00
Florian HENRY
e93a362a0d fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm 2021-07-23 18:33:18 +02:00
UT from dolibit
8920590e28
Update llx_00_c_country.sql
Singapour  -->  Singapore 
Iles Aland  -->  Åland Island 
Samoa américaines  -->  American Samoa 
Antarctique  -->  Antarctica 
Antigua-et-Barbuda  -->  Antigua and Barbuda 
Azerbaïdjan  -->  Azerbaijan
2021-07-23 12:48:25 +02:00
UT from dolibit
38b34b1f19
Update llx_20_c_departements.sql
Panama
2021-07-23 12:25:59 +02:00
Laurent Destailleur
4c505619e3 FIX look and field v14 2021-07-23 00:02:14 +02:00
netdrag
6cfd8c6f24
Order Supplier Email Sender Extension
Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
2021-07-22 18:38:22 +02:00
Frédéric FRANCE
44fa70c7c7
notify class indent 2021-07-22 09:24:14 +02:00
Frédéric FRANCE
5e6c942caf
notify class indent 2021-07-22 09:22:42 +02:00
Florian HENRY
8eafbf9101 add column into export invoice 2021-07-21 17:00:57 +02:00
Florian HENRY
ee1e6c2780 fix: bad setEventMessages input 2021-07-21 14:52:37 +02:00
Frédéric FRANCE
f2dc3be051
add categories tickets migration 2021-07-21 08:40:07 +02:00
Laurent Destailleur
062c39c40d Fix html entities when we should not 2021-07-21 01:40:45 +02:00
Laurent Destailleur
afa6ced6c9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/main.inc.php
2021-07-21 01:29:22 +02:00
Laurent Destailleur
23f708c0d4 Fix phpcs 2021-07-21 01:27:14 +02:00
Laurent Destailleur
dbed6bc0da Fix #yogosha6678 2021-07-21 01:18:48 +02:00
Laurent Destailleur
e02fbadcd7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/main.inc.php
2021-07-21 00:41:40 +02:00
Laurent Destailleur
e4bb5ed008 Fix phpcs 2021-07-21 00:35:08 +02:00
Laurent Destailleur
c2f1781fae Fix #huntr5bb5a52-3b1c-40ad-9c64-61735f886736 2021-07-21 00:14:03 +02:00
Laurent Destailleur
219a2a860b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/main.inc.php
2021-07-20 23:59:33 +02:00
Laurent Destailleur
dc7ff07517 Fix #huntr7144bb4b-338f-45f0-a70e-088ef1f4c037 2021-07-20 23:54:22 +02:00
Laurent Destailleur
08e06f9789 Fix #hunter2c606116-f212-49e0-967c-11f8666be43b 2021-07-20 23:28:57 +02:00
Laurent Destailleur
2383fd02c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-20 23:20:22 +02:00
Laurent Destailleur
0e18bd4be1 Fix #hunter2cd3fc73-65a1-4615-9143-9e7febd81a15 2021-07-20 23:15:31 +02:00
Laurent Destailleur
e25171b9f5 Fix phpcs 2021-07-20 23:03:19 +02:00
Laurent Destailleur
b57eb8284e Fix Improper Authorization Check reported by Ahsan Aziz. 2021-07-20 22:42:23 +02:00
Laurent Destailleur
cea35bd208 Fix pass was lost on error 2021-07-20 22:14:11 +02:00
Frédéric FRANCE
828e65c724
Update html.form.class.php 2021-07-20 20:56:01 +02:00
Frédéric FRANCE
71b95f3511
fix php8 warnings 2021-07-20 20:54:27 +02:00
Givriz
3df4cd8857 Compatibility phpv8 2021-07-20 20:28:04 +02:00
Frédéric FRANCE
922354f366
Update projects.php 2021-07-20 18:19:27 +02:00
ksar
4d6b63dbed
FIX #18181
FIX #18181
2021-07-20 16:14:47 +02:00
lmarcouiller
60f0eeaea2 update inventory to be jquerry 2021-07-20 15:06:33 +02:00
lmarcouiller
dd9eb28230 Barcode scanner tool update 2021-07-20 14:43:36 +02:00
Josep Lluís
20f347cd4c
Add missing line product variables
Add missing line product variables: product_tobatch and product_barcode
2021-07-20 07:07:01 +02:00
BENKE Charlene
98a2c35ab5
PHP V8 warning error, use of not declared array 2021-07-19 17:51:06 +02:00
atm-florian
8fdd9deb16 FIX: datepickers cloned using jquery are not working 2021-07-19 14:06:56 +02:00
BENKE Charlene
acdac32845
FIX : "disabled" field missing on definition 2021-07-19 13:46:50 +02:00
lmarcouiller
b309af0ab8 First push new scan quanty inventory 2021-07-19 13:43:48 +02:00
BENKE Charlene
09954a3047
Update html.formcompany.class.php 2021-07-19 11:01:06 +02:00
BENKE Charlene
49a74c2b3b
Update index.php 2021-07-19 10:42:11 +02:00
BENKE Charlene
29bdbe02f2
Update index.php 2021-07-19 10:21:18 +02:00
BENKE Charlene
1a23cfc6f9
Update list.php 2021-07-19 10:01:11 +02:00
BENKE Charlene
4eeaac5ee7
warning error on PHP 8 2021-07-19 09:45:47 +02:00
trekmorris
284627b693
Update opensurvey.lang manually
This file is not auto sync from transifex . So update it manually .
2021-07-16 23:55:29 +08:00