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

Merge pull request #5 from altairis-noe/warehouses_in_project

Browse Source 
association of warehouses to projects
This commit is contained in:
Noé Cendrier 2021-04-15 10:43:42 +02:00 committed by GitHub
commit 7da62aa752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formprojet.class.php
View File

@ -505,7 +505,7 @@ class FormProjets
} }
$linkedtothirdparty = false; $linkedtothirdparty = false;
if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'payment_salary', 'payment_various', 'chargesociales'))) { if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'payment_salary', 'payment_various', 'chargesociales', 'entrepot'))) {
$linkedtothirdparty = true; $linkedtothirdparty = true;
} }

1
htdocs/langs/en_US/projects.lang
View File

@ -89,6 +89,7 @@ TimeConsumed=Consumed
ListOfTasks=List of tasks ListOfTasks=List of tasks
GoToListOfTimeConsumed=Go to list of time consumed GoToListOfTimeConsumed=Go to list of time consumed
GanttView=Gantt View GanttView=Gantt View
ListWarehouseAssociatedProject=List of warehouses associated to the project
ListProposalsAssociatedProject=List of the commercial proposals related to the project ListProposalsAssociatedProject=List of the commercial proposals related to the project
ListOrdersAssociatedProject=List of sales orders related to the project ListOrdersAssociatedProject=List of sales orders related to the project
ListInvoicesAssociatedProject=List of customer invoices related to the project ListInvoicesAssociatedProject=List of customer invoices related to the project

1
htdocs/langs/fr_FR/projects.lang
View File

@ -89,6 +89,7 @@ TimeConsumed=Consommé
ListOfTasks=Liste de tâches ListOfTasks=Liste de tâches
GoToListOfTimeConsumed=Aller à la liste des temps consommés GoToListOfTimeConsumed=Aller à la liste des temps consommés
GanttView=Vue Gantt GanttView=Vue Gantt
ListWarehouseAssociatedProject=Liste des entrepôts associés au projet
ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
ListOrdersAssociatedProject=Liste des commandes clients associées au projet ListOrdersAssociatedProject=Liste des commandes clients associées au projet
ListInvoicesAssociatedProject=Liste des factures clients associées au projet ListInvoicesAssociatedProject=Liste des factures clients associées au projet

1
htdocs/product/stock/card.php
View File

@ -41,6 +41,7 @@ $langs->loadLangs(array('products', 'stocks', 'companies', 'categories'));
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha'); $cancel = GETPOST('cancel', 'alpha');
$confirm = GETPOST('confirm'); $confirm = GETPOST('confirm');
$projectid = GETPOST('projectid', 'int');
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');

3
htdocs/projet/class/project.class.php
View File

@ -1778,6 +1778,9 @@ class Project extends CommonObject
if ($tableName == "actioncomm") { if ($tableName == "actioncomm") {
$sql .= " SET fk_project=".$this->id; $sql .= " SET fk_project=".$this->id;
$sql .= " WHERE id=".$elementSelectId; $sql .= " WHERE id=".$elementSelectId;
} elseif ($tableName == "entrepot") {
$sql .= " SET fk_project=".$this->id;
$sql .= " WHERE rowid=".$elementSelectId;
} else { } else {
$sql .= " SET fk_projet=".$this->id; $sql .= " SET fk_projet=".$this->id;
$sql .= " WHERE rowid=".$elementSelectId; $sql .= " WHERE rowid=".$elementSelectId;

13
htdocs/projet/element.php
View File

@ -7,6 +7,7 @@
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2016 Josep Lluís Amador <joseplluis@lliuretic.cat> * Copyright (C) 2016 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr> * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2021 Noé Cendrier <noe.cendrier@altairis.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -360,6 +361,18 @@ print '<br>';
*/ */
$listofreferent = array( $listofreferent = array(
'entrepot'=>array(
'name'=>"Warehouse",
'title'=>"ListWarehouseAssociatedProject",
'class'=>'Entrepot',
'table'=>'entrepot',
'datefieldname'=>'date_entrepot',
'urlnew'=>DOL_URL_ROOT.'/product/stock/card.php?action=create&projectid='.$id,
'lang'=>'entrepot',
'buttonnew'=>'AddWarehouse',
'project_field'=>'fk_project',
'testnew'=>$user->rights->stock->creer,
'test'=>$conf->stock->enabled && $user->rights->stock->lire),
'propal'=>array( 'propal'=>array(
'name'=>"Proposals", 'name'=>"Proposals",
'title'=>"ListProposalsAssociatedProject", 'title'=>"ListProposalsAssociatedProject",