lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into dolibarr_fixbugs

Browse Source
This commit is contained in:
NextGestion 2023-05-06 10:51:34 +01:00 committed by GitHub
commit ef34dcdb22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_project_opportunities.php
View File

@ -111,7 +111,7 @@ class box_project_opportunities extends ModeleBoxes
$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok $sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
$sql .= " AND p.usage_opportunity = 1"; $sql .= " AND p.usage_opportunity = 1";
$sql .= " AND p.fk_opp_status > 0"; $sql .= " AND p.fk_opp_status > 0";
$sql .= " AND p.fk_statut IN (".$this->db->sanitize($projectstatic::STATUS_DRAFT.", ".$projectstatic::STATUS_VALIDATED).")"; // draft and open projects $sql .= " AND p.fk_statut IN (".$this->db->sanitize($projectstatic::STATUS_DRAFT.",".$projectstatic::STATUS_VALIDATED).")"; // draft and open projects
//$sql .= " AND p.fk_statut = ".((int) $projectstatic::STATUS_VALIDATED); // Only open projects //$sql .= " AND p.fk_statut = ".((int) $projectstatic::STATUS_VALIDATED); // Only open projects
if (empty($user->rights->projet->all->lire)) { if (empty($user->rights->projet->all->lire)) {
$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users $sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users

2
htdocs/langs/en_US/bills.lang
View File

@ -285,7 +285,7 @@ SetRevenuStamp=Set revenue stamp
Billed=Billed Billed=Billed
RecurringInvoices=Recurring invoices RecurringInvoices=Recurring invoices
RecurringInvoice=Recurring invoice RecurringInvoice=Recurring invoice
RecurringInvoiceSource=Recurring invoice ar source RecurringInvoiceSource=Recurring invoice source
RepeatableInvoice=Template invoice RepeatableInvoice=Template invoice
RepeatableInvoices=Template invoices RepeatableInvoices=Template invoices
RecurringInvoicesJob=Generation of recurring invoices (sales invoices) RecurringInvoicesJob=Generation of recurring invoices (sales invoices)