\n";
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 1dfb49a6c05..0364b829b2c 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -825,10 +825,13 @@ if ($mode == 'common')
$warningmessage = '';
if (!empty($arrayofwarnings[$modName]))
{
- print ''."\n";
+ print ''."\n";
foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage)
{
- $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
+ if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
+ {
+ $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
+ }
}
}
if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext))
diff --git a/htdocs/bom/admin/index.html b/htdocs/bom/admin/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/bom/admin/setup.php b/htdocs/bom/admin/setup.php
deleted file mode 100644
index 6abad8e3d58..00000000000
--- a/htdocs/bom/admin/setup.php
+++ /dev/null
@@ -1,129 +0,0 @@
-
- * Copyright (C) 2019 Maxime Kohlhaas
- * Copyright (C) 2019 Frédéric France
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-/**
- * \file bom/admin/setup.php
- * \ingroup bom
- * \brief Bom setup page.
- */
-
-// Load Dolibarr environment
-require '../../main.inc.php';
-// Libraries
-require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
-require_once '../lib/bom.lib.php';
-//require_once "../class/myclass.class.php";
-
-// Translations
-$langs->loadLangs(array("admin", "mrp"));
-
-// Access control
-if (!$user->admin) accessforbidden();
-
-// Parameters
-$action = GETPOST('action', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-$arrayofparameters = array(
- 'BILLOFMATERIALS_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
- 'BILLOFMATERIALS_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
-);
-
-
-/*
- * Actions
- */
-include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-
-/*
- * View
- */
-
-$page_name = "BomSetup";
-llxHeader('', $langs->trans($page_name));
-
-// Subheader
-$linkback = ''.$langs->trans("BackToModuleList").'';
-
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_bom');
-
-// Configuration header
-$head = bomAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "bom");
-
-// Setup page goes here
-echo $langs->trans("BomSetupPage").'
';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 9f08e944ee0..9872874a1d0 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -99,8 +99,11 @@ if (!empty($user->socid)) $socid = $user->socid;
$isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', 'rowid', $isdraft);
+$usercancreate = $user->rights->fournisseur->facture->creer;
+
$permissionnote = $user->rights->fournisseur->facture->creer; // Used by the include of actions_setnotes.inc.php
$permissiondellink = $user->rights->fournisseur->facture->creer; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $user->rights->fournisseur->facture->creer; // Used by the include of actions_lineupdown.inc.php
$permissiontoadd = $user->rights->fournisseur->facture->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
@@ -402,7 +405,7 @@ if (empty($reshook))
$result = $object->update($user);
if ($result < 0) dol_print_error($db, $object->error);
}
- elseif ($action == "setabsolutediscount" && $user->rights->fournisseur->facture->creer)
+ elseif ($action == "setabsolutediscount" && $usercancreate)
{
// POST[remise_id] or POST[remise_id_for_payment]
@@ -460,7 +463,7 @@ if (empty($reshook))
}
}
// Convertir en reduc
- elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate)
{
$object->fetch($id);
$object->fetch_thirdparty();
@@ -472,12 +475,13 @@ if (empty($reshook))
$canconvert = 0;
if ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
- if (($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_STANDARD) && $object->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
+ if (($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_STANDARD) && $object->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not refunded completely and not already converted and amount of payment is 0 (see also the real condition used as the condition to show button converttoreduc)
if ($canconvert)
{
$db->begin();
$amount_ht = $amount_tva = $amount_ttc = array();
+ $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
// Loop on each vat rate
$i = 0;
@@ -492,6 +496,20 @@ if (empty($reshook))
}
}
+ // If some payments were already done, we change the amount to pay using same prorate
+ if (! empty($conf->global->SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED)) {
+ $alreadypaid = $object->getSommePaiement(); // This can be not 0 if we allow to create credit to reuse from credit notes partially refunded.
+ if ($alreadypaid && abs($alreadypaid) < abs($object->total_ttc)) {
+ $ratio = abs(($object->total_ttc - $alreadypaid) / $object->total_ttc);
+ foreach($amount_ht as $vatrate => $val) {
+ $amount_ht[$vatrate] = price2num($amount_ht[$vatrate] * $ratio, 'MU');
+ $amount_tva[$vatrate] = price2num($amount_tva[$vatrate] * $ratio, 'MU');
+ $amount_ttc[$vatrate] = price2num($amount_ttc[$vatrate] * $ratio, 'MU');
+ }
+ }
+ }
+ //var_dump($amount_ht);var_dump($amount_tva);var_dump($amount_ttc);exit;
+
// Insert one discount by VAT rate category
$discount = new DiscountAbsolute($db);
if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
@@ -513,6 +531,7 @@ if (empty($reshook))
{
// If we're on a standard invoice, we have to get excess paid to create a discount in TTC without VAT
+ // Total payments
$sql = 'SELECT SUM(pf.amount) as total_paiements';
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf, '.MAIN_DB_PREFIX.'paiementfourn as p';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id AND c.entity IN ('.getEntity('c_paiement').')';
@@ -526,7 +545,20 @@ if (empty($reshook))
$res = $db->fetch_object($resql);
$total_paiements = $res->total_paiements;
- $discount->amount_ht = $discount->amount_ttc = $total_paiements - $object->total_ttc;
+ // Total credit note and deposit
+ $total_creditnote_and_deposit = 0;
+ $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
+ $sql .= " re.description, re.fk_invoice_supplier_source";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
+ $sql .= " WHERE fk_invoice_supplier = ".$object->id;
+ $resql = $db->query($sql);
+ if (!empty($resql)) {
+ while ($obj = $db->fetch_object($resql)) {
+ $total_creditnote_and_deposit += $obj->amount_ttc;
+ }
+ } else dol_print_error($db);
+
+ $discount->amount_ht = $discount->amount_ttc = $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
$discount->amount_tva = 0;
$discount->tva_tx = 0;
@@ -600,7 +632,7 @@ if (empty($reshook))
}
// Create
- elseif ($action == 'add' && $user->rights->fournisseur->facture->creer)
+ elseif ($action == 'add' && $usercancreate)
{
if ($socid > 0) $object->socid = GETPOST('socid', 'int');
@@ -632,7 +664,7 @@ if (empty($reshook))
if (!$error) {
// This is a replacement invoice
- $result = $object->fetch(GETPOST('fac_replacement'), 'int');
+ $result = $object->fetch(GETPOST('fac_replacement', 'int'));
$object->fetch_thirdparty();
$object->ref = GETPOST('ref', 'nohtml');
@@ -1143,7 +1175,7 @@ if (empty($reshook))
else
{
$idprod = GETPOST('idprod', 'int');
- $price_ht = '';
+ $price_ht = GETPOST('price_ht');
$tva_tx = '';
}
@@ -1209,6 +1241,7 @@ if (empty($reshook))
$idprod = 0;
if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') $idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+ $reg = array();
if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg))
{
$idprod = $reg[1];
@@ -1250,7 +1283,20 @@ if (empty($reshook))
if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
$type = $productsupplier->type;
- $price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');
+ if ($price_ht != '' || $price_ht_devise != '') {
+ $price_base_type = 'HT';
+ $pu = price2num($price_ht, 'MU');
+ $pu_ht_devise = price2num($price_ht_devise, 'MU');
+ } else {
+ $price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');
+ if (empty($object->multicurrency_code) || ($productsupplier->fourn_multicurrency_code != $object->multicurrency_code)) { // If object is in a different currency and price not in this currency
+ $pu = $productsupplier->fourn_pu;
+ $pu_ht_devise = 0;
+ } else {
+ $pu = $productsupplier->fourn_pu;
+ $pu_ht_devise = $productsupplier->fourn_multicurrency_unitprice;
+ }
+ }
$ref_supplier = $productsupplier->ref_supplier;
@@ -1260,7 +1306,6 @@ if (empty($reshook))
$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
- $pu = $productsupplier->fourn_pu;
if (empty($pu)) $pu = 0; // If pu is '' or null, we force to have a numeric value
$result = $object->addline(
@@ -1283,8 +1328,9 @@ if (empty($reshook))
$array_options,
$productsupplier->fk_unit,
0,
- $productsupplier->fourn_multicurrency_unitprice,
- $ref_supplier
+ $pu_ht_devise,
+ $ref_supplier,
+ ''
);
}
if ($idprod == -99 || $idprod == 0)
@@ -3129,7 +3175,9 @@ else
print '
';
}
// For deposit invoice
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 2ef48bc9f0b..4d29f03003e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -180,7 +180,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
/***************************************************************************************
*
- * Migration des donnees
+ * Migration of data
*
***************************************************************************************/
$db->begin();
@@ -553,6 +553,11 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
print '
';
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
+ $db->query($sql, 1);
+
+
// We always commit.
// Process is designed so we can run it several times whatever is situation.
$db->commit();
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 902790cc23a..e6ea4390fd8 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -61,7 +61,7 @@ Payment=Payment
PaymentBack=Payment back
CustomerInvoicePaymentBack=Payment back
Payments=Payments
-PaymentsBack=Payments back
+PaymentsBack=Refunds
paymentInInvoiceCurrency=in invoices currency
PaidBack=Paid back
DeletePayment=Delete payment
@@ -78,7 +78,7 @@ ReceivedCustomersPaymentsToValid=Received customers payments to validate
PaymentsReportsForYear=Payments reports for %s
PaymentsReports=Payments reports
PaymentsAlreadyDone=Payments already done
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Refunds already done
PaymentRule=Payment rule
PaymentMode=Payment Type
PaymentTypeDC=Debit/Credit Card
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index e33d1112deb..964bd7c436c 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -79,3 +79,5 @@ InvoiceIsAlreadyValidated=Invoice is already validated
NoLinesToBill=No lines to bill
CustomReceipt=Custom Receipt
ReceiptName=Receipt Name
+ProductSupplements=Product Supplements
+SupplementCategory=Supplement category
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 79c4978b660..a565ecb59b8 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -251,9 +251,9 @@ ShowListTicketWithTrackId=Display ticket list from track ID
ShowTicketWithTrackId=Display ticket from track ID
TicketPublicDesc=You can create a support ticket or check from an existing ID.
YourTicketSuccessfullySaved=Ticket has been successfully saved!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s.
+MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation
+TicketNewEmailSubject=Ticket creation confirmation - Ref %s
TicketNewEmailSubjectCustomer=New support ticket
TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
@@ -272,7 +272,7 @@ Subject=Subject
ViewTicket=View ticket
ViewMyTicketList=View my ticket list
ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created
+TicketNewEmailSubjectAdmin=New ticket created - Ref %s
TicketNewEmailBodyAdmin=
Ticket has just been created with ID #%s, see information: