Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0

This commit is contained in:
Laurent Destailleur 2024-01-18 12:10:41 +01:00
commit 6e487735f6
2 changed files with 26 additions and 6 deletions

View file

@ -6509,14 +6509,31 @@ class Form
}
if (getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC')) { // If option to have vat for end customer for services is on
require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()))) {
// If SERVICE_ARE_ECOMMERCE_200238EC=1 combo list vat rate of purchaser and seller countries
// If SERVICE_ARE_ECOMMERCE_200238EC=2 combo list only the vat rate of the purchaser country
$selectVatComboMode = getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC');
if (isInEEC($societe_vendeuse) && isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()) {
// We also add the buyer country code
if (is_numeric($type)) {
if ($type == 1) { // We know product is a service
$code_country .= ",'" . $societe_acheteuse->country_code . "'";
switch ($selectVatComboMode) {
case '1':
$code_country .= ",'" . $societe_acheteuse->country_code . "'";
break;
case '2':
$code_country = "'" . $societe_acheteuse->country_code . "'";
break;
}
}
} elseif (!$idprod) { // We don't know type of product
$code_country .= ",'" . $societe_acheteuse->country_code . "'";
switch ($selectVatComboMode) {
case '1':
$code_country .= ",'" . $societe_acheteuse->country_code . "'";
break;
case '2':
$code_country = "'" . $societe_acheteuse->country_code . "'";
break;
}
} else {
$prodstatic = new Product($this->db);
$prodstatic->fetch($idprod);

View file

@ -173,6 +173,9 @@ if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a ded
}
$arrayfields['author'] = array('label' => $langs->trans("By"), 'checked' => 1);
$arrayfields['t.note'] = array('label' => $langs->trans("Note"), 'checked' => 1);
if (!getDolGlobalInt('PROJECT_HIDE_TASKS') && getDolGlobalInt('PROJECT_BILL_TIME_SPENT') && !$projectstatic->usage_bill_time ) {
$projectstatic->usage_bill_time=1;
}
if (isModEnabled('service') && !empty($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
$arrayfields['t.fk_product'] = array('label' => $langs->trans("Product"), 'checked' => 1);
}
@ -2282,7 +2285,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$userstatic->lastname = $task_time->lastname;
$userstatic->firstname = $task_time->firstname;
$userstatic->photo = $task_time->photo;
$userstatic->statut = $task_time->user_status;
$userstatic->status = $task_time->user_status;
print $userstatic->getNomUrl(-1);
}
print '</td>';
@ -2564,7 +2567,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$userstatic->lastname = $task_time->lastname;
$userstatic->firstname = $task_time->firstname;
$userstatic->photo = $task_time->photo;
$userstatic->statut = $task_time->user_status;
$userstatic->status = $task_time->user_status;
print $userstatic->getNomUrl(-1);
}
print '</td>';
@ -2720,7 +2723,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
$userstatic->lastname = $task_time->lastname;
$userstatic->firstname = $task_time->firstname;
$userstatic->photo = $task_time->photo;
$userstatic->statut = $task_time->user_status;
$userstatic->status = $task_time->user_status;
print $userstatic->getNomUrl(-1);
}
print '</td>';