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 9.0

Browse Source 
Conflicts:
	htdocs/exports/export.php
This commit is contained in:
Laurent Destailleur 2018-12-16 13:39:16 +01:00
commit e14b426985
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/exports/export.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2005-2018 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Charles-Fr BENKE <charles.fr@benke.fr>
@ -123,14 +123,14 @@ $entitytolang = array(
$array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
$array_filtervalue=isset($_SESSION["export_filtered_fields"])?$_SESSION["export_filtered_fields"]:array();
$datatoexport=GETPOST("datatoexport");
$action=GETPOST('action', 'alpha');
$confirm=GETPOST('confirm', 'alpha');
$step=GETPOST("step")?GETPOST("step"):1;
$export_name=GETPOST("export_name");
$hexa=GETPOST("hexa");
$exportmodelid=GETPOST("exportmodelid");
$field=GETPOST("field");
$datatoexport=GETPOST("datatoexport","aZ09");
$action=GETPOST('action','alpha');
$confirm=GETPOST('confirm','alpha');
$step=GETPOST("step","int")?GETPOST("step","int"):1;
$export_name=GETPOST("export_name","alphanohtml");
$hexa=GETPOST("hexa","alpha");
$exportmodelid=GETPOST("exportmodelid","int");
$field=GETPOST("field","alpa");
$objexport=new Export($db);
$objexport->load_arrays($user,$datatoexport);

2
htdocs/product/agenda.php
View File

@ -159,7 +159,7 @@ if ($id > 0 || $ref)
if ((! empty($objproduct->id) || ! empty($objcon->id)) && $permok)
{
//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
if (get_class($objproduct) == 'Product') $out.='&amp;prodid='.$objproduct->id;
if (get_class($objproduct) == 'Product') $out.='&amp;prodid='.$objproduct->id.'&origin=product&originid='.$id;
$out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
//$out.=$langs->trans("AddAnAction").' ';
//$out.=img_picto($langs->trans("AddAnAction"),'filenew');