diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 004b32a83fc..80db1bf7efc 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2278,7 +2278,7 @@ if ($action == 'create')
$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
// Form to add new line
- if ($object->statut == Propal::STATUS_DRAFT && $user->rights->propal->creer)
+ if ($object->statut == Propal::STATUS_DRAFT && $user->rights->propal->creer && $action != 'selectlines')
{
if ($action != 'editline')
{
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index a13d80c083c..100cabc6023 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -53,7 +53,14 @@ foreach($linkedObjectBlock as $key => $objectlink)
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
- | trans("Proposal"); ?> |
+ trans("Proposal"); ?>
+ global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
+ {
+ $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
+ print ' ';
+ }
+ ?>
+ |
getNomUrl(1); ?> |
ref_client; ?> |
date,'day'); ?> |
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index dbce9c2e76d..1387765ccc3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2120,9 +2120,14 @@ if (empty($reshook))
{
if($fromElement == 'commande')
{
- dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class');
+ dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
$lineClassName = 'OrderLine';
}
+ elseif($fromElement == 'propal')
+ {
+ dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
+ $lineClassName = 'PropaleLigne';
+ }
$nextRang = count($object->lines) + 1;
$importCount = 0;
$error = 0;
@@ -2164,6 +2169,7 @@ if (empty($reshook))
$pu_ht_devise = $originLine->multicurrency_subprice;
$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $ventil, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit,$pu_ht_devise);
+
if($res > 0){
$importCount++;
}else{
@@ -4534,7 +4540,7 @@ else if ($id > 0 || ! empty($ref))
&& $object->statut == Facture::STATUS_DRAFT
&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION) )
{
- $compatibleImportElementsList = array('commande'); // import from linked elements
+ $compatibleImportElementsList = array('commande','propal'); // import from linked elements
}
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem,$compatibleImportElementsList);