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

Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into

Browse Source 
hregis-8.0_canvas

# Conflicts:
#	htdocs/product/canvas/product/tpl/list.tpl.php
This commit is contained in:
Laurent Destailleur 2018-06-30 18:29:08 +02:00
commit d8c7c61951
16 changed files with 497 additions and 742 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/canvas.class.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -145,7 +145,7 @@ class Canvas
{ {
if (empty($this->template_dir)) return 0; if (empty($this->template_dir)) return 0;
if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1; if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
else return 0; else return 0;
} }
@ -161,7 +161,7 @@ class Canvas
global $db, $conf, $langs, $user, $canvas; global $db, $conf, $langs, $user, $canvas;
global $form, $formfile; global $form, $formfile;
include $this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template
} }

3
htdocs/core/lib/security.lib.php
View File

@ -174,11 +174,10 @@ function dol_verifyHash($chain, $hash, $type='0')
* @param string $feature2 Feature to check, second level of permission (optional). Can be a 'or' check with 'level1|level2'. * @param string $feature2 Feature to check, second level of permission (optional). Can be a 'or' check with 'level1|level2'.
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional) * @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
* @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional) * @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional)
* @param Canvas $objcanvas Object canvas
* @return int Always 1, die process if not allowed * @return int Always 1, die process if not allowed
* @see dol_check_secure_access_document * @see dol_check_secure_access_document
*/ */
function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $objcanvas=null) function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
{ {
global $db, $conf; global $db, $conf;
global $hookmanager; global $hookmanager;

2
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
View File

@ -35,3 +35,5 @@ ALTER TABLE llx_extrafields ADD COLUMN help text NULL;
ALTER TABLE llx_user ADD COLUMN dateemploymentend date after dateemployment; ALTER TABLE llx_user ADD COLUMN dateemploymentend date after dateemployment;
ALTER TABLE llx_c_field_list ADD COLUMN visible tinyint DEFAULT 1 NOT NULL AFTER search;

3
htdocs/install/mysql/tables/llx_c_field_list.sql
View File

@ -1,5 +1,5 @@
-- ======================================================================== -- ========================================================================
-- Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> -- Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
-- --
-- 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
@ -33,6 +33,7 @@ create table llx_c_field_list
align varchar(6) DEFAULT 'left', -- align (left,center,right) align varchar(6) DEFAULT 'left', -- align (left,center,right)
sort tinyint DEFAULT 1 NOT NULL, -- add sort field sort tinyint DEFAULT 1 NOT NULL, -- add sort field
search tinyint DEFAULT 0 NOT NULL, -- add search field search tinyint DEFAULT 0 NOT NULL, -- add search field
visible tinyint DEFAULT 1 NOT NULL, -- visibility of field. 0=Never visible, 1=Visible on list and forms, 2=Visible on list only
enabled varchar(255) DEFAULT 1, -- Condition to show or hide enabled varchar(255) DEFAULT 1, -- Condition to show or hide
rang integer DEFAULT 0 rang integer DEFAULT 0

30
htdocs/product/canvas/product/actions_card_product.class.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -123,20 +123,6 @@ class ActionsCardProduct
$this->tpl['tva_tx'] = $form->load_tva("tva_tx",-1,$mysoc,''); $this->tpl['tva_tx'] = $form->load_tva("tva_tx",-1,$mysoc,'');
} }
if ($action == 'create' || $action == 'edit')
{
// Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
$this->tpl['status'] = $form->selectarray('statut',$statutarray,$this->status);
//To Buy
$statutarray=array('1' => $langs->trans("Yes"), '0' => $langs->trans("No"));
$this->tpl['tobuy'] = $form->selectarray('tobuy',$statutarray,$this->status_buy);
$this->tpl['description'] = $this->description;
$this->tpl['note'] = $this->note;
}
if ($action == 'view') if ($action == 'view')
{ {
$head = product_prepare_head($this->object); $head = product_prepare_head($this->object);
@ -180,10 +166,13 @@ class ActionsCardProduct
{ {
// Status // Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell")); $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
$this->tpl['status'] = $form->selectarray('statut',$statutarray,$_POST["statut"]); $this->tpl['status'] = $form->selectarray('statut',$statutarray,$this->object->status);
$statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy")); $statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
$this->tpl['status_buy'] = $form->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]); $this->tpl['status_buy'] = $form->selectarray('statut_buy',$statutarray,$this->object->status_buy);
$this->tpl['description'] = $this->description;
$this->tpl['note'] = $this->note;
// Finished // Finished
$statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
@ -208,10 +197,6 @@ class ActionsCardProduct
if ($action == 'view') if ($action == 'view')
{ {
// Status
$this->tpl['status'] = $this->object->getLibStatut(2,0);
$this->tpl['status_buy'] = $this->object->getLibStatut(2,1);
// Photo // Photo
$this->tpl['nblignes'] = 4; $this->tpl['nblignes'] = 4;
if ($this->object->is_photo_available($conf->product->multidir_output[$this->object->entity])) if ($this->object->is_photo_available($conf->product->multidir_output[$this->object->entity]))
@ -268,7 +253,7 @@ class ActionsCardProduct
$this->field_list = array(); $this->field_list = array();
$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang"; $sql = "SELECT rowid, name, alias, title, align, sort, search, visible, enabled, rang";
$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list"; $sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
$sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'"; $sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
@ -293,6 +278,7 @@ class ActionsCardProduct
$fieldlist["align"] = $obj->align; $fieldlist["align"] = $obj->align;
$fieldlist["sort"] = $obj->sort; $fieldlist["sort"] = $obj->sort;
$fieldlist["search"] = $obj->search; $fieldlist["search"] = $obj->search;
$fieldlist["visible"] = $obj->visible;
$fieldlist["enabled"] = verifCond($obj->enabled); $fieldlist["enabled"] = verifCond($obj->enabled);
$fieldlist["order"] = $obj->rang; $fieldlist["order"] = $obj->rang;

9
htdocs/product/canvas/product/tpl/card_create.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -30,7 +30,10 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<?php print load_fiche_titre($langs->trans("Product")); ?> <?php
print load_fiche_titre($langs->trans("NewProduct"),'','title_products.png');
dol_fiche_head('');
?>
<?php dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors); ?> <?php dol_htmloutput_errors((is_numeric($object->error)?'':$object->error),$object->errors); ?>
@ -65,7 +68,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<tr> <tr>
<td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td> <td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td>
<td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_tobuy); ?></td> <td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_buy); ?></td>
</tr> </tr>
<?php if (! empty($conf->stock->enabled)) { ?> <?php if (! empty($conf->stock->enabled)) { ?>

8
htdocs/product/canvas/product/tpl/card_edit.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -31,7 +31,9 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<?php <?php
print load_fiche_titre($langs->trans("Product")); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type);
dol_fiche_head($head, 'card', $titre, 0, 'product');
dol_htmloutput_errors($object->error,$object->errors); dol_htmloutput_errors($object->error,$object->errors);
?> ?>
@ -65,7 +67,7 @@ dol_htmloutput_errors($object->error,$object->errors);
<tr> <tr>
<td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td> <td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td>
<td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_tobuy); ?></td> <td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_buy); ?></td>
</tr> </tr>
<?php if (! empty($conf->stock->enabled)) { ?> <?php if (! empty($conf->stock->enabled)) { ?>

27
htdocs/product/canvas/product/tpl/card_view.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -27,7 +27,20 @@ $object=$GLOBALS['object'];
?> ?>
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<?php echo $langs->trans("Product"); ?> <?php
$head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type);
dol_fiche_head($head, 'card', $titre, -1, 'product');
$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
?>
<?php dol_htmloutput_errors($object->error,$object->errors); ?> <?php dol_htmloutput_errors($object->error,$object->errors); ?>
@ -50,16 +63,6 @@ $object=$GLOBALS['object'];
</tr> </tr>
<tr>
<td><?php echo $langs->trans("Status").' ('.$langs->trans("Sell").')'; ?></td>
<td><?php echo $object->status; ?></td>
</tr>
<tr>
<td><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td>
<td><?php echo $object->status_buy; ?></td>
</tr>
<tr> <tr>
<td class="tdtop"><?php echo $langs->trans("Description"); ?></td> <td class="tdtop"><?php echo $langs->trans("Description"); ?></td>
<td colspan="2"><?php echo $object->description; ?></td> <td colspan="2"><?php echo $object->description; ?></td>

107
htdocs/product/canvas/product/tpl/list.tpl.php
View File

@ -1,107 +0,0 @@
<?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}
?>
<!-- BEGIN PHP TEMPLATE -->
<table class="notopnoleftnoright allwidth" style="margin-bottom: 2px;">
<tr>
<td class="nobordernopadding" width="40" align="left" valign="middle">
<?php echo $title_picto; ?>
</td>
<td class="nobordernopadding" valign="middle">
<div class="titre"><?php echo $title_text; ?></div>
</td>
</tr>
</table>
<form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post" name="formulaire">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
<input type="hidden" name="action" value="list">
<input type="hidden" name="sortfield" value="<?php echo $sortfield; ?>">
<input type="hidden" name="sortorder" value="<?php echo $sortorder; ?>">
<input type="hidden" name="canvas" value="default">
<input type="hidden" name="type" value="0">
<table class="liste allwidth">
<!-- FIELDS TITLE -->
<tr class="liste_titre">
<?php
foreach($fieldlist as $field) {
if ($field['enabled']) {
if ($field['sort']) { ?>
<td class="liste_titre" align="<?php echo $field['align']; ?>"><?php echo $field['title']; ?>
<a href="<?php echo $_SERVER["PHP_SELF"];?>?sortfield=<?php echo $field['name']; ?>&amp;sortorder=asc&amp;begin=&amp;tosell=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
<img src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/1downarrow.png" border="0" alt="A-Z" title="A-Z">
</a>
<a href="<?php echo $_SERVER["PHP_SELF"];?>?sortfield=<?php echo $field['name']; ?>&amp;sortorder=desc&amp;begin=&amp;tosell=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
<img src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/1uparrow.png" border="0" alt="Z-A" title="Z-A">
</a>
</td>
<?php } else { ?>
<td class="liste_titre" align="<?php echo $field['align']; ?>"><?php echo $field['title']; ?></td>
<?php } } } ?>
</tr>
<!-- FIELDS SEARCH -->
<tr class="liste_titre">
<?php
$num = count($fieldlist);
foreach($fieldlist as $key => $searchfield) {
if ($searchfield['enabled']) {
if ($searchfield['search']) { ?>
<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
<?php } else if ($key == $num) {
print '<td class="liste_titre" align="right">';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
} else { ?>
<td class="liste_titre">&nbsp;</td>
<?php } } } ?>
</tr>
<!-- FIELDS DATA -->
<?php
foreach($datas as $line) {
?>
<tr class="oddeven">
<?php
foreach($line as $key => $value) {
foreach($fieldlist as $field) {
if ($field['alias'] == $key) { ?>
<td align="<?php echo $field['align']; ?>"><?php echo $value; ?></td>
<?php } } } ?>
</tr>
<?php } ?>
</table>
</form>
<!-- END PHP TEMPLATE -->

30
htdocs/product/canvas/service/actions_card_service.class.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -122,20 +122,6 @@ class ActionsCardService
$this->tpl['tva_tx'] = $form->load_tva("tva_tx",-1,$mysoc,''); $this->tpl['tva_tx'] = $form->load_tva("tva_tx",-1,$mysoc,'');
} }
if ($action == 'create' || $action == 'edit')
{
// Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
$this->tpl['status'] = $form->selectarray('statut',$statutarray,$this->status);
//To Buy
$statutarray=array('1' => $langs->trans("Yes"), '0' => $langs->trans("No"));
$this->tpl['tobuy'] = $form->selectarray('tobuy',$statutarray,$this->status_buy);
$this->tpl['description'] = $this->description;
$this->tpl['note'] = $this->note;
}
if ($action == 'view') if ($action == 'view')
{ {
$head = product_prepare_head($this->object); $head = product_prepare_head($this->object);
@ -182,10 +168,13 @@ class ActionsCardService
{ {
// Status // Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell")); $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
$this->tpl['status'] = $form->selectarray('statut',$statutarray,$_POST["statut"]); $this->tpl['status'] = $form->selectarray('statut',$statutarray,$this->object->status);
$statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy")); $statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
$this->tpl['status_buy'] = $form->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]); $this->tpl['status_buy'] = $form->selectarray('statut_buy',$statutarray,$this->object->status_buy);
$this->tpl['description'] = $this->description;
$this->tpl['note'] = $this->note;
// Duration unit // Duration unit
// TODO creer fonction // TODO creer fonction
@ -203,10 +192,6 @@ class ActionsCardService
if ($action == 'view') if ($action == 'view')
{ {
// Status
$this->tpl['status'] = $this->object->getLibStatut(2,0);
$this->tpl['status_buy'] = $this->object->getLibStatut(2,1);
// Photo // Photo
$this->tpl['nblignes'] = 4; $this->tpl['nblignes'] = 4;
if ($this->object->is_photo_available($conf->service->multidir_output[$this->object->entity])) if ($this->object->is_photo_available($conf->service->multidir_output[$this->object->entity]))
@ -247,7 +232,7 @@ class ActionsCardService
$this->field_list = array(); $this->field_list = array();
$sql = "SELECT rowid, name, alias, title, align, sort, search, enabled, rang"; $sql = "SELECT rowid, name, alias, title, align, sort, search, visible, enabled, rang";
$sql.= " FROM ".MAIN_DB_PREFIX."c_field_list"; $sql.= " FROM ".MAIN_DB_PREFIX."c_field_list";
$sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'"; $sql.= " WHERE element = '".$this->db->escape($this->fieldListName)."'";
$sql.= " AND entity = ".$conf->entity; $sql.= " AND entity = ".$conf->entity;
@ -272,6 +257,7 @@ class ActionsCardService
$fieldlist["align"] = $obj->align; $fieldlist["align"] = $obj->align;
$fieldlist["sort"] = $obj->sort; $fieldlist["sort"] = $obj->sort;
$fieldlist["search"] = $obj->search; $fieldlist["search"] = $obj->search;
$fieldlist["visible"] = $obj->visible;
$fieldlist["enabled"] = verifCond($obj->enabled); $fieldlist["enabled"] = verifCond($obj->enabled);
$fieldlist["order"] = $obj->rang; $fieldlist["order"] = $obj->rang;

9
htdocs/product/canvas/service/tpl/card_create.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -30,7 +30,10 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE CREATE.TPL --> <!-- BEGIN PHP TEMPLATE CREATE.TPL -->
<?php print load_fiche_titre($langs->trans("Service")); ?> <?php
print load_fiche_titre($langs->trans("NewService"),'','title_products.png');
dol_fiche_head('');
?>
<?php dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); ?> <?php dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']); ?>
@ -62,7 +65,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<tr> <tr>
<td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td> <td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td>
<td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_tobuy); ?></td> <td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_buy); ?></td>
</tr> </tr>
<tr><td><?php echo $langs->trans("Duration"); ?></td> <tr><td><?php echo $langs->trans("Duration"); ?></td>

8
htdocs/product/canvas/service/tpl/card_edit.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -31,7 +31,9 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<!-- BEGIN PHP TEMPLATE EDIT.TPL --> <!-- BEGIN PHP TEMPLATE EDIT.TPL -->
<?php <?php
print load_fiche_titre($langs->trans("Service")); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type);
dol_fiche_head($head, 'card', $titre, 0, 'service');
dol_htmloutput_errors($object->error,$object->errors); dol_htmloutput_errors($object->error,$object->errors);
?> ?>
@ -62,7 +64,7 @@ dol_htmloutput_errors($object->error,$object->errors);
<tr> <tr>
<td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td> <td class="fieldrequired"><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td>
<td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_tobuy); ?></td> <td><?php echo $form->selectarray('statut_buy',$statutarray,$object->status_buy); ?></td>
</tr> </tr>
<tr><td><?php echo $langs->trans("Duration"); ?></td> <tr><td><?php echo $langs->trans("Duration"); ?></td>

27
htdocs/product/canvas/service/tpl/card_view.tpl.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2018 Regis Houssin <regis.houssin@capnetworks.com>
* *
* 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
@ -27,7 +27,20 @@ $object=$GLOBALS['object'];
?> ?>
<!-- BEGIN PHP TEMPLATE VIEW.TPL --> <!-- BEGIN PHP TEMPLATE VIEW.TPL -->
<?php echo $langs->trans("Service"); ?> <?php
$head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type);
dol_fiche_head($head, 'card', $titre, -1, 'service');
$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
?>
<?php dol_htmloutput_errors($object->error,$object->errors); ?> <?php dol_htmloutput_errors($object->error,$object->errors); ?>
@ -50,16 +63,6 @@ $object=$GLOBALS['object'];
</tr> </tr>
<tr>
<td><?php echo $langs->trans("Status").' ('.$langs->trans("Sell").')'; ?></td>
<td><?php echo $object->status; ?></td>
</tr>
<tr>
<td><?php echo $langs->trans("Status").' ('.$langs->trans("Buy").')'; ?></td>
<td><?php echo $object->status_buy; ?></td>
</tr>
<tr> <tr>
<td class="tdtop"><?php echo $langs->trans("Description"); ?></td> <td class="tdtop"><?php echo $langs->trans("Description"); ?></td>
<td colspan="2"><?php echo $object->description; ?></td> <td colspan="2"><?php echo $object->description; ?></td>

107
htdocs/product/canvas/service/tpl/list.tpl.php
View File

@ -1,107 +0,0 @@
<?php
/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}
?>
<!-- BEGIN PHP TEMPLATE -->
<table class="notopnoleftnoright allwidth" style="margin-bottom: 2px;">
<tr>
<td class="nobordernopadding" width="40" align="left" valign="middle">
<?php echo $title_picto; ?>
</td>
<td class="nobordernopadding" valign="middle">
<div class="titre"><?php echo $title_text; ?></div>
</td>
</tr>
</table>
<form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post" name="formulaire">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
<input type="hidden" name="action" value="list">
<input type="hidden" name="sortfield" value="<?php echo $sortfield; ?>">
<input type="hidden" name="sortorder" value="<?php echo $sortorder; ?>">
<input type="hidden" name="canvas" value="service">
<input type="hidden" name="type" value="1">
<table class="liste allwidth">
<!-- FIELDS TITLE -->
<tr class="liste_titre">
<?php
foreach($fieldlist as $field) {
if ($field['enabled']) {
if ($field['sort']) { ?>
<td class="liste_titre" align="<?php echo $field['align']; ?>"><?php echo $field['title']; ?>
<a href="<?php echo $_SERVER["PHP_SELF"];?>?sortfield=<?php echo $field['name']; ?>&amp;sortorder=asc&amp;begin=&amp;tosell=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
<img src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/1downarrow.png" border="0" alt="A-Z" title="A-Z">
</a>
<a href="<?php echo $_SERVER["PHP_SELF"];?>?sortfield=<?php echo $field['name']; ?>&amp;sortorder=desc&amp;begin=&amp;tosell=&amp;canvas=default&amp;fourn_id=&amp;snom=&amp;sref=">
<img src="<?php echo DOL_URL_ROOT; ?>/theme/<?php echo $conf->theme; ?>/img/1uparrow.png" border="0" alt="Z-A" title="Z-A">
</a>
</td>
<?php } else { ?>
<td class="liste_titre" align="<?php echo $field['align']; ?>"><?php echo $field['title']; ?></td>
<?php } } } ?>
</tr>
<!-- FIELDS SEARCH -->
<tr class="liste_titre">
<?php
$num = count($fieldlist);
foreach($fieldlist as $key => $searchfield) {
if ($searchfield['enabled']) {
if ($searchfield['search']) { ?>
<td class="liste_titre" align="<?php echo $searchfield['align']; ?>"><input class="flat" type="text" name="s<?php echo $searchfield['alias']; ?>" value=""></td>
<?php } else if ($key == $num) {
print '<td class="liste_titre" align="right">';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
} else { ?>
<td class="liste_titre">&nbsp;</td>
<?php } } } ?>
</tr>
<!-- FIELDS DATA -->
<?php
foreach($datas as $line) {
?>
<tr class="oddeven">
<?php
foreach($line as $key => $value) {
foreach($fieldlist as $field) {
if ($field['alias'] == $key) { ?>
<td align="<?php echo $field['align']; ?>"><?php echo $value; ?></td>
<?php } } } ?>
</tr>
<?php } ?>
</table>
</form>
<!-- END PHP TEMPLATE -->

2
htdocs/product/card.php
View File

@ -112,7 +112,7 @@ if (! empty($canvas))
// Security check // Security check
$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : '')); $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
$fieldtype = (! empty($id) ? 'rowid' : 'ref'); $fieldtype = (! empty($id) ? 'rowid' : 'ref');
$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas); $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('productcard','globalcard')); $hookmanager->initHooks(array('productcard','globalcard'));

21
htdocs/product/list.php
View File

@ -450,26 +450,6 @@ if ($resql)
print "</div><br>"; print "</div><br>";
} }
if (! empty($canvas) && file_exists(DOL_DOCUMENT_ROOT.'/product/canvas/'.$canvas.'/actions_card_'.$canvas.'.class.php'))
{
$fieldlist = $object->field_list;
$datas = $object->list_datas;
$picto='title.png';
$title_picto = img_picto('',$picto);
$title_text = $title;
// Default templates directory
$template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/'.$canvas.'/tpl/';
// Check if a custom template is present
if (file_exists(DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$canvas.'/list.tpl.php'))
{
$template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$canvas.'/';
}
include $template_dir.'list.tpl.php'; // Include native PHP templates
}
else
{
if ($sall) if ($sall)
{ {
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@ -973,7 +953,6 @@ if ($resql)
print "</table>"; print "</table>";
print "</div>"; print "</div>";
}
print '</form>'; print '</form>';
} }
else else