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

Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink

Browse Source 
NEW add objectLink on expedition
This commit is contained in:
Laurent Destailleur 2022-07-10 19:33:49 +02:00 committed by GitHub
commit bd3af19978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.form.class.php
View File

@ -8550,7 +8550,7 @@ class Form
if (empty($conf->supplier_proposal->enabled)) { if (empty($conf->supplier_proposal->enabled)) {
continue; // Do not show if module disabled continue; // Do not show if module disabled
} }
} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') { } elseif ($objecttype == 'shipping' || $objecttype == 'shipment' || $objecttype == 'expedition') {
$tplpath = 'expedition'; $tplpath = 'expedition';
if (empty($conf->expedition->enabled)) { if (empty($conf->expedition->enabled)) {
continue; // Do not show if module disabled continue; // Do not show if module disabled
@ -8668,6 +8668,11 @@ class Form
'perms'=>1, 'perms'=>1,
'label'=>'LinkToProposal', 'label'=>'LinkToProposal',
'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('propal').')'), 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('propal').')'),
'shipping'=>array(
'enabled'=>$conf->expedition->enabled,
'perms'=>1,
'label'=>'LinkToExpedition',
'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."expedition as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('shipping').')'),
'order'=>array( 'order'=>array(
'enabled'=>(!empty($conf->commande->enabled) ? $conf->commande->enabled : 0), 'enabled'=>(!empty($conf->commande->enabled) ? $conf->commande->enabled : 0),
'perms'=>1, 'perms'=>1,

4
htdocs/expedition/card.php
View File

@ -2569,8 +2569,8 @@ if ($action == 'create' || (empty($action) && empty($id))) {
// Show links to link elements // Show links to link elements
//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order')); $linktoelem = $form->showLinkToObjectBlock($object, null, array('shipping'));
$somethingshown = $form->showLinkedObjectBlock($object, ''); $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
print '</div><div class="fichehalfright">'; print '</div><div class="fichehalfright">';

3
htdocs/expedition/tpl/linkedobjectblock.tpl.php
View File

@ -60,8 +60,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
// For now, shipments must stay linked to order, so link is not deletable // For now, shipments must stay linked to order, so link is not deletable
if ($object->element != 'commande') { if ($object->element != 'commande') {
?> ?>
<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td> <a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td> <?php
<?php
} }
?> ?>
</tr> </tr>

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

@ -801,6 +801,7 @@ URLPhoto=URL of photo/logo
SetLinkToAnotherThirdParty=Link to another third party SetLinkToAnotherThirdParty=Link to another third party
LinkTo=Link to LinkTo=Link to
LinkToProposal=Link to proposal LinkToProposal=Link to proposal
LinkToExpedition= Link to expedition
LinkToOrder=Link to order LinkToOrder=Link to order
LinkToInvoice=Link to invoice LinkToInvoice=Link to invoice
LinkToTemplateInvoice=Link to template invoice LinkToTemplateInvoice=Link to template invoice

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

@ -801,6 +801,7 @@ URLPhoto=URL de la photo/logo
SetLinkToAnotherThirdParty=Lier vers un autre tiers SetLinkToAnotherThirdParty=Lier vers un autre tiers
LinkTo=Lier à LinkTo=Lier à
LinkToProposal=Lier à une proposition commerciale LinkToProposal=Lier à une proposition commerciale
LinkToExpedition=Lier à une expédition
LinkToOrder=Lier à une commande LinkToOrder=Lier à une commande
LinkToInvoice=Lier à une facture LinkToInvoice=Lier à une facture
LinkToTemplateInvoice=Lien vers le modèle de facture LinkToTemplateInvoice=Lien vers le modèle de facture