Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
7bcd5c2fa2
Merge pull request #17076 from ptibogxiv/patch-422
NEW add action trigger for member excluded
2021-08-17 19:01:07 +02:00
Laurent Destailleur
b96dd7a796
Merge branch 'develop' into patch-422 2021-08-17 19:00:46 +02:00
Laurent Destailleur
0858487119 Fix #18343 2021-08-17 18:52:33 +02:00
Laurent Destailleur
a19f8cd87d
Merge pull request #18337 from atm-maxime/fix_holidays_users
Fix : we only want employee users for holidays
2021-08-17 18:37:38 +02:00
Laurent Destailleur
7af5a714a6
Merge pull request #18372 from bb2a/PDF_Propal_frame_option
[NEW] PDF show Frame option
2021-08-17 18:34:33 +02:00
Laurent Destailleur
ec2df3b282
Update pdf.php 2021-08-17 18:33:10 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-17 18:30:37 +02:00
Laurent Destailleur
16c290f735
Merge pull request #18383 from marc-dll/12.0_FIX_invoice_tiny_negative_vat
FIX: invoice validation: when checking if any VAT rate has a negative amount, prevent false positives with -1.0E-14 amounts
2021-08-17 18:24:33 +02:00
Laurent Destailleur
d09c2de6a8 Better position of options 2021-08-17 18:18:08 +02:00
Laurent Destailleur
33697cec1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-08-17 18:13:18 +02:00
Laurent Destailleur
fb1e5f72d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:11:08 +02:00
Laurent Destailleur
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
2021-08-17 18:07:10 +02:00
Laurent Destailleur
ceaaff0186 Sellby always before Eatby #18361 2021-08-17 18:05:34 +02:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Laurent Destailleur
d1858e02b5
Update card.php 2021-08-17 17:03:41 +02:00
Laurent Destailleur
32c37188ae
Merge pull request #18374 from bb2a/PDF_Option_show_code_client
NEW Add option to hide customer code on PDF documents
2021-08-17 16:56:32 +02:00
Laurent Destailleur
d4c35edef4
Update pdf.php 2021-08-17 16:55:56 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-17 16:46:06 +02:00
Laurent Destailleur
0f175f1730
Merge pull request #18387 from bb2a/PDF_show_sender_name
NEW Can hide sender name on PDF documents
2021-08-17 16:41:48 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name 2021-08-17 16:41:19 +02:00
Laurent Destailleur
6e7c8677eb
Update admin.lang 2021-08-17 16:40:31 +02:00
Laurent Destailleur
a0d82e6bf7
Merge pull request #18404 from lainwir3d/add_url_shipment_substitute
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the shipment URL
2021-08-17 16:36:09 +02:00
Laurent Destailleur
582bf1415e
Update functions.lib.php 2021-08-17 16:35:43 +02:00
Laurent Destailleur
2035499a34
Merge pull request #18402 from lainwir3d/add_newref_substitute
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
2021-08-17 16:34:11 +02:00
Laurent Destailleur
3e5deeadf4
Merge pull request #18406 from vincentjdc/supplier-order-hide-product-label
NEW : Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
2021-08-17 16:24:19 +02:00
Laurent Destailleur
284207aeb3
Merge pull request #18429 from atm-quentin/NEW_hook_after_rank_update
NEW hook after rank update
2021-08-17 16:15:44 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php 2021-08-17 16:12:45 +02:00
Laurent Destailleur
59479a4c6e
Merge pull request #18405 from atm-gauthier/NEW/printFieldListFrom_on_several_lists
NEW : printFieldListFrom hook call on several lists
2021-08-17 15:58:28 +02:00
Laurent Destailleur
23e8b513c1
Merge pull request #18410 from ATM-Consulting/FIX_14.0_dolibarr_user_account_creation_from_recruitment_applicant_card
FIX: e-mail of applicant is not transferred to the new user when creating a user from an applicant card
2021-08-17 15:56:20 +02:00
Laurent Destailleur
46ca3ffd5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 15:50:46 +02:00
Laurent Destailleur
1a8ad5abfa Propagate $outputlangs to getExtrafieldContent method. 2021-08-17 15:50:28 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1
Customer Invoice - Multicurrency Remaining to Pay
2021-08-17 15:26:36 +02:00
Laurent Destailleur
e2424bda1e
Merge pull request #18419 from henrynopo/patch-2
Supplier Invoice - Multicurrency remainder to pay
2021-08-17 15:26:16 +02:00
Laurent Destailleur
8c093cfb31 Link to doc 2021-08-17 14:44:26 +02:00
Laurent Destailleur
758b7c404f Doc 2021-08-17 14:12:57 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
7d61609462 FIX #yogosha6907 2021-08-17 13:13:04 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf NEW hook after rank update 2021-08-17 09:33:50 +02:00
Laurent Destailleur
a7cbf3ec21 Doc 2021-08-17 05:15:19 +02:00
Laurent Destailleur
558c716931 Trans 2021-08-17 05:10:30 +02:00
Laurent Destailleur
88ccaeb13f Help setup 2021-08-17 05:08:15 +02:00
Laurent Destailleur
92d6ad9597 Removed old simple POS module ('cashdesk' module) 2021-08-17 04:57:53 +02:00
Laurent Destailleur
a31f991b39 Doc 2021-08-17 04:41:33 +02:00
Laurent Destailleur
30c40afeb3 Debug notification setup 2021-08-17 04:28:16 +02:00
Laurent Destailleur
a3d04163b6 Debug notification setup 2021-08-17 04:14:28 +02:00
Laurent Destailleur
7a3649b6e5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-17 03:21:13 +02:00
Laurent Destailleur
f51bcf0038 Debug notification module 2021-08-17 03:20:57 +02:00
Laurent Destailleur
cffa58a206
Merge pull request #18400 from lainwir3d/fix_notif_shipping_validate_email_template
FIX #18399 Fix shipment validation email template override.
2021-08-17 03:06:47 +02:00