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

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

Browse Source 
Conflicts:
	htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur 2018-08-16 14:50:04 +02:00
commit 4e02b134da
7 changed files with 178 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/comm/action/card.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com> * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2005-2017 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2017 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
@ -927,6 +927,15 @@ if ($action == 'create')
if ($id > 0) if ($id > 0)
{ {
$result1=$object->fetch($id); $result1=$object->fetch($id);
if ($result1 <= 0)
{
$langs->load("errors");
print $langs->trans("ErrorRecordNotFound");
llxFooter();
exit;
}
$result2=$object->fetch_thirdparty(); $result2=$object->fetch_thirdparty();
$result2=$object->fetch_projet(); $result2=$object->fetch_projet();
$result3=$object->fetch_contact(); $result3=$object->fetch_contact();
@ -957,7 +966,7 @@ if ($id > 0)
$object->note = GETPOST("note",'none'); $object->note = GETPOST("note",'none');
} }
if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0) if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
{ {
dol_print_error($db,$object->error); dol_print_error($db,$object->error);
exit; exit;

2
htdocs/comm/action/class/actioncomm.class.php
View File

@ -621,7 +621,7 @@ class ActionComm extends CommonObject
$this->contact->id = $obj->fk_contact; // deprecated $this->contact->id = $obj->fk_contact; // deprecated
$this->fk_element = $obj->elementid; $this->fk_element = $obj->elementid;
$this->elementid = $obj->elementid; $this->elementid = $obj->elementid;
$this->elementtype = $obj->elementtype; $this->elementtype = $obj->elementtype;
$this->fetchResources(); $this->fetchResources();

3
htdocs/comm/propal/class/propal.class.php
View File

@ -1335,11 +1335,10 @@ class Propal extends CommonObject
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON p.fk_availability = ca.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
$sql.= " WHERE p.fk_statut = c.id";
if ($ref) { if ($ref) {
$sql.= " AND p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid $sql.= " AND p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
$sql.= " AND p.ref='".$ref."'"; $sql.= " AND p.ref='".$this->db->escape($ref)."'";
} }
else $sql.= " AND p.rowid=".$rowid; else $sql.= " AND p.rowid=".$rowid;

12
htdocs/contrat/services_list.php
View File

@ -197,7 +197,7 @@ $now=dol_now();
$form=new Form($db); $form=new Form($db);
$sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,"; $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,";
$sql.= " s.rowid as socid, s.nom as name,"; $sql.= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
$sql.= " cd.rowid, cd.description, cd.statut,"; $sql.= " cd.rowid, cd.description, cd.statut,";
$sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,"; if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
@ -540,6 +540,11 @@ while ($i < min($num,$limit))
$contractstatic->id=$obj->cid; $contractstatic->id=$obj->cid;
$contractstatic->ref=$obj->ref?$obj->ref:$obj->cid; $contractstatic->ref=$obj->ref?$obj->ref:$obj->cid;
$companystatic->id=$obj->socid;
$companystatic->name=$obj->name;
$companystatic->email=$obj->email;
$companystatic->client=$obj->client;
$companystatic->fournisseur=$obj->fournisseur;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
@ -555,7 +560,7 @@ while ($i < min($num,$limit))
if (! empty($arrayfields['p.description']['checked'])) if (! empty($arrayfields['p.description']['checked']))
{ {
print '<td>'; print '<td>';
if ($obj->pid) if ($obj->pid > 0)
{ {
$productstatic->id=$obj->pid; $productstatic->id=$obj->pid;
$productstatic->type=$obj->ptype; $productstatic->type=$obj->ptype;
@ -625,9 +630,6 @@ while ($i < min($num,$limit))
if (! empty($arrayfields['s.nom']['checked'])) if (! empty($arrayfields['s.nom']['checked']))
{ {
print '<td>'; print '<td>';
$companystatic->id=$obj->socid;
$companystatic->name=$obj->name;
$companystatic->client=1;
print $companystatic->getNomUrl(1,'customer',28); print $companystatic->getNomUrl(1,'customer',28);
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;

209
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -160,6 +160,7 @@ class doc_generic_project_odt extends ModelePDFProjects
'task_description'=>$task->description, 'task_description'=>$task->description,
'task_fk_parent'=>$task->fk_parent, 'task_fk_parent'=>$task->fk_parent,
'task_duration'=>$task->duration, 'task_duration'=>$task->duration,
'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
'task_progress'=>$task->progress, 'task_progress'=>$task->progress,
'task_public'=>$task->public, 'task_public'=>$task->public,
'task_date_start'=>dol_print_date($task->date_start,'day'), 'task_date_start'=>dol_print_date($task->date_start,'day'),
@ -317,7 +318,10 @@ class doc_generic_project_odt extends ModelePDFProjects
'tasktime_fk_user'=>$tasktime['fk_user'], 'tasktime_fk_user'=>$tasktime['fk_user'],
'tasktime_user_name'=>$tasktime['name'], 'tasktime_user_name'=>$tasktime['name'],
'tasktime_user_first'=>$tasktime['firstname'], 'tasktime_user_first'=>$tasktime['firstname'],
'tasktime_fullcivname'=>$tasktime['fullcivname'] 'tasktime_fullcivname'=>$tasktime['fullcivname'],
'tasktime_amountht'=>$tasktime['amountht'],
'tasktime_amountttc'=>$tasktime['amountttc'],
'tasktime_thm'=>$tasktime['thm'],
); );
} }
@ -698,7 +702,7 @@ class doc_generic_project_odt extends ModelePDFProjects
//Time ressources //Time ressources
$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note"; $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
$sql.= ", u.lastname, u.firstname"; $sql.= ", u.lastname, u.firstname, t.thm";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t"; $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
$sql .= " , ".MAIN_DB_PREFIX."user as u"; $sql .= " , ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE t.fk_task =".$task->id; $sql .= " WHERE t.fk_task =".$task->id;
@ -712,6 +716,35 @@ class doc_generic_project_odt extends ModelePDFProjects
$i = 0; $i = 0;
$tasks = array(); $tasks = array();
$listlinestasktime = $listlines->__get('taskstimes'); $listlinestasktime = $listlines->__get('taskstimes');
if (empty($num)) {
$row['rowid']='';
$row['task_date']='';
$row['task_duration']='';
$row['$tasktime']='';
$row['note']='';
$row['fk_user']='';
$row['name']='';
$row['firstname']='';
$row['fullcivname']='';
$row['amountht']='';
$row['amountttc']='';
$row['thm']='';
$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
foreach($tmparray as $key => $val)
{
try
{
$listlinestasktime->setVars($key, $val, true, 'UTF-8');
}
catch(OdfException $e)
{
}
catch(SegmentException $e)
{
}
}
$listlinestasktime->merge();
}
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_array($resql); $row = $this->db->fetch_array($resql);
@ -723,6 +756,16 @@ class doc_generic_project_odt extends ModelePDFProjects
$row['fullcivname']=''; $row['fullcivname']='';
} }
if (!empty($row['thm'])) {
$row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
$defaultvat = get_default_tva($mysoc, $mysoc);
$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');;
} else {
$row['amountht']=0;
$row['amountttc']=0;
$row['thm']=0;
}
$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs); $tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
foreach($tmparray as $key => $val) foreach($tmparray as $key => $val)
@ -884,60 +927,114 @@ class doc_generic_project_odt extends ModelePDFProjects
//List of referent //List of referent
$listofreferent=array( $listofreferent = array(
'propal'=>array( 'propal' => array(
'title'=>"ListProposalsAssociatedProject", 'title' => "ListProposalsAssociatedProject",
'class'=>'Propal', 'class' => 'Propal',
'table'=>'propal', 'table' => 'propal',
'test'=>$conf->propal->enabled && $user->rights->propale->lire), 'test' => $conf->propal->enabled && $user->rights->propale->lire
'order'=>array( ),
'title'=>"ListOrdersAssociatedProject", 'order' => array(
'class'=>'Commande', 'title' => "ListOrdersAssociatedProject",
'table'=>'commande', 'class' => 'Commande',
'test'=>$conf->commande->enabled && $user->rights->commande->lire), 'table' => 'commande',
'invoice'=>array( 'test' => $conf->commande->enabled && $user->rights->commande->lire
'title'=>"ListInvoicesAssociatedProject", ),
'class'=>'Facture', 'invoice' => array(
'table'=>'facture', 'title' => "ListInvoicesAssociatedProject",
'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'class' => 'Facture',
'invoice_predefined'=>array( 'table' => 'facture',
'title'=>"ListPredefinedInvoicesAssociatedProject", 'test' => $conf->facture->enabled && $user->rights->facture->lire
'class'=>'FactureRec', ),
'table'=>'facture_rec', 'invoice_predefined' => array(
'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'title' => "ListPredefinedInvoicesAssociatedProject",
'order_supplier'=>array( 'class' => 'FactureRec',
'title'=>"ListSupplierOrdersAssociatedProject", 'table' => 'facture_rec',
'table'=>'commande_fournisseur', 'test' => $conf->facture->enabled && $user->rights->facture->lire
'class'=>'CommandeFournisseur', ),
'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire), 'proposal_supplier' => array(
'invoice_supplier'=>array( 'title' => "ListSupplierProposalsAssociatedProject",
'title'=>"ListSupplierInvoicesAssociatedProject", 'class' => 'SupplierProposal',
'table'=>'facture_fourn', 'table' => 'supplier_proposal',
'class'=>'FactureFournisseur', 'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire), ),
'contract'=>array( 'order_supplier' => array(
'title'=>"ListContractAssociatedProject", 'title' => "ListSupplierOrdersAssociatedProject",
'class'=>'Contrat', 'table' => 'commande_fournisseur',
'table'=>'contrat', 'class' => 'CommandeFournisseur',
'test'=>$conf->contrat->enabled && $user->rights->contrat->lire), 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
'intervention'=>array( ),
'title'=>"ListFichinterAssociatedProject", 'invoice_supplier' => array(
'class'=>'Fichinter', 'title' => "ListSupplierInvoicesAssociatedProject",
'table'=>'fichinter', 'table' => 'facture_fourn',
'disableamount'=>1, 'class' => 'FactureFournisseur',
'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire), 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
'trip'=>array( ),
'title'=>"ListTripAssociatedProject", 'contract' => array(
'class'=>'Deplacement', 'title' => "ListContractAssociatedProject",
'table'=>'deplacement', 'class' => 'Contrat',
'disableamount'=>1, 'table' => 'contrat',
'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire), 'test' => $conf->contrat->enabled && $user->rights->contrat->lire
'agenda'=>array( ),
'title'=>"ListActionsAssociatedProject", 'intervention' => array(
'class'=>'ActionComm', 'title' => "ListFichinterAssociatedProject",
'table'=>'actioncomm', 'class' => 'Fichinter',
'disableamount'=>1, 'table' => 'fichinter',
'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire) 'disableamount' => 1,
'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire
),
'shipping' => array(
'title' => "ListShippingAssociatedProject",
'class' => 'Expedition',
'table' => 'expedition',
'disableamount' => 1,
'test' => $conf->expedition->enabled && $user->rights->expedition->lire
),
'trip' => array(
'title' => "ListTripAssociatedProject",
'class' => 'Deplacement',
'table' => 'deplacement',
'disableamount' => 1,
'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire
),
'expensereport' => array(
'title' => "ListExpenseReportsAssociatedProject",
'class' => 'ExpenseReportLine',
'table' => 'expensereport_det',
'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire
),
'donation' => array(
'title' => "ListDonationsAssociatedProject",
'class' => 'Don',
'table' => 'don',
'test' => $conf->don->enabled && $user->rights->don->lire
),
'loan' => array(
'title' => "ListLoanAssociatedProject",
'class' => 'Loan',
'table' => 'loan',
'test' => $conf->loan->enabled && $user->rights->loan->read
),
'chargesociales' => array(
'title' => "ListSocialContributionAssociatedProject",
'class' => 'ChargeSociales',
'table' => 'chargesociales',
'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id,
'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
),
'stock_mouvement' => array(
'title' => "ListMouvementStockProject",
'class' => 'MouvementStock',
'table' => 'stock_mouvement',
'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
),
'agenda' => array(
'title' => "ListActionsAssociatedProject",
'class' => 'ActionComm',
'table' => 'actioncomm',
'disableamount' => 1,
'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
)
); );
//Insert reference //Insert reference

BIN
htdocs/install/doctemplates/projects/template_project.odt
View File

Binary file not shown.

10
htdocs/langs/en_US/companies.lang
View File

@ -5,10 +5,10 @@ SelectThirdParty=Select a third party
ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information? ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
DeleteContact=Delete a contact/address DeleteContact=Delete a contact/address
ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information? ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
MenuNewThirdParty=new Third Party MenuNewThirdParty=New Third Party
MenuNewCustomer=new Customer MenuNewCustomer=New Customer
MenuNewProspect=new Prospect MenuNewProspect=Nnew Prospect
MenuNewSupplier=new Vendor MenuNewSupplier=New Vendor
MenuNewPrivateIndividual=New private individual MenuNewPrivateIndividual=New private individual
NewCompany=New company (prospect, customer, vendor) NewCompany=New company (prospect, customer, vendor)
NewThirdParty=New Third Party (prospect, customer, vendor) NewThirdParty=New Third Party (prospect, customer, vendor)
@ -333,7 +333,7 @@ NoContactForAnyProposal=This contact is not a contact for any commercial proposa
NoContactForAnyContract=This contact is not a contact for any contract NoContactForAnyContract=This contact is not a contact for any contract
NoContactForAnyInvoice=This contact is not a contact for any invoice NoContactForAnyInvoice=This contact is not a contact for any invoice
NewContact=New contact NewContact=New contact
NewContactAddress=new Contact/Address NewContactAddress=New Contact/Address
MyContacts=My contacts MyContacts=My contacts
Capital=Capital Capital=Capital
CapitalOf=Capital of %s CapitalOf=Capital of %s