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

Format source

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-11 01:36:53 +00:00
parent bac0610e79
commit b93304fd18
2 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
htdocs/core/tpl/predefinedproductline_edit.tpl.php
View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* $Id: predefinedproductline_edit.tpl.php,v 1.17 2011/08/10 22:47:33 eldy Exp $ * $Id: predefinedproductline_edit.tpl.php,v 1.18 2011/08/11 01:36:53 eldy Exp $
* *
* Need to have following variables defined: * Need to have following variables defined:
* $conf * $conf
@ -27,75 +27,69 @@
?> ?>
<!-- BEGIN PHP TEMPLATE predefinedproductline_edit.tpl.php --> <!-- BEGIN PHP TEMPLATE predefinedproductline_edit.tpl.php -->
<form action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'#'.$line->id; ?>" method="POST"> <form
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>"> action="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'#'.$line->id; ?>"
<input type="hidden" name="action" value="updateligne"> method="POST"><input type="hidden" name="token"
<input type="hidden" name="id" value="<?php echo $this->id; ?>"> value="<?php echo $_SESSION['newtoken']; ?>"> <input type="hidden"
<input type="hidden" name="lineid" value="<?php echo $line->id; ?>"> name="action" value="updateligne"> <input type="hidden" name="id"
value="<?php echo $this->id; ?>"> <input type="hidden" name="lineid"
value="<?php echo $line->id; ?>">
<tr <?php echo $bc[$var]; ?>> <tr <?php echo $bc[$var]; ?>>
<td> <td><a name="<?php echo $line->id; ?>"></a> <input type="hidden"
<a name="<?php echo $line->id; ?>"></a> name="productid" value="<?php echo $line->fk_product; ?>"> <a
href="<?php echo DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product; ?>">
<?php
if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
else print img_object($langs->trans('ShowProduct'),'product');
echo ' '.$line->ref;
?></a><?php
echo ' - '.nl2br($line->product_label);
echo '<br>';
<input type="hidden" name="productid" value="<?php echo $line->fk_product; ?>"> if (is_object($hookmanager))
<a href="<?php echo DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product; ?>"> {
<?php $parameters=array('fk_parent_line'=>$line_fk_parent_line);
if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service'); $hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
else print img_object($langs->trans('ShowProduct'),'product');
echo ' '.$line->ref;
?></a><?php
echo ' - '.nl2br($line->product_label);
echo '<br>';
if (is_object($hookmanager)) // editeur wysiwyg
{ $nbrows=ROWS_2;
$parameters=array('fk_parent_line'=>$line_fk_parent_line); if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action); require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
// editeur wysiwyg $doleditor->Create();
$nbrows=ROWS_2; ?></td>
if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
$doleditor->Create();
?>
</td>
<td align="right"><?php echo $html->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,'',$line->info_bits); ?></td> <td align="right"><?php echo $html->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,'',$line->info_bits); ?></td>
<td align="right"><input size="6" type="text" class="flat" name="subprice" value="<?php echo price($line->subprice,0,'',0); ?>"></td> <td align="right"><input size="6" type="text" class="flat"
name="subprice" value="<?php echo price($line->subprice,0,'',0); ?>"></td>
<td align="right"> <td align="right"><?php if (($line->info_bits & 2) != 2) { ?> <input
<?php if (($line->info_bits & 2) != 2) { ?> size="2" type="text" class="flat" name="qty"
<input size="2" type="text" class="flat" name="qty" value="<?php echo $line->qty; ?>"> value="<?php echo $line->qty; ?>"> <?php } else { ?> &nbsp; <?php } ?>
<?php } else { ?>
&nbsp;
<?php } ?>
</td> </td>
<td align="right" nowrap> <td align="right" nowrap><?php if (($line->info_bits & 2) != 2) { ?> <input
<?php if (($line->info_bits & 2) != 2) { ?> size="1" type="text" class="flat" name="remise_percent"
<input size="1" type="text" class="flat" name="remise_percent" value="<?php echo $line->remise_percent; ?>">% value="<?php echo $line->remise_percent; ?>">% <?php } else { ?>
<?php } else { ?> &nbsp; <?php } ?></td>
&nbsp;
<?php } ?>
</td>
<td align="center" colspan="5" valign="middle"><input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>"> <td align="center" colspan="5" valign="middle"><input type="submit"
<br><input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>"></td> class="button" name="save"
value="<?php echo $langs->trans("Save"); ?>"> <br>
<input type="submit" class="button" name="cancel"
value="<?php echo $langs->trans("Cancel"); ?>"></td>
</tr> </tr>
<?php if ($conf->service->enabled && $dateSelector && $line->product_type == 1) { ?> <?php if ($conf->service->enabled && $dateSelector && $line->product_type == 1) { ?>
<tr <?php echo $bc[$var]; ?>> <tr <?php echo $bc[$var]; ?>>
<td colspan="9"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?> <td colspan="9"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
<?php <?php
echo $html->select_date($line->date_start,'date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_start?0:1,"updateligne"); echo $html->select_date($line->date_start,'date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_start?0:1,"updateligne");
echo ' '.$langs->trans('to').' '; echo ' '.$langs->trans('to').' ';
echo $html->select_date($line->date_end,'date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_end?0:1,"updateligne"); echo $html->select_date($line->date_end,'date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_end?0:1,"updateligne");
?> ?></td>
</td>
</tr> </tr>
<?php } ?> <?php } ?></form>
</form>
<!-- END PHP TEMPLATE predefinedproductline_edit.tpl.php --> <!-- END PHP TEMPLATE predefinedproductline_edit.tpl.php -->

6
htdocs/includes/menus/init_menu_auguria.sql
View File

@ -1,6 +1,6 @@
-- --
-- $Id: init_menu_auguria.sql,v 1.126 2011/08/10 23:48:25 eldy Exp $ -- $Id: init_menu_auguria.sql,v 1.127 2011/08/11 01:39:15 eldy Exp $
-- $Revision: 1.126 $ -- $Revision: 1.127 $
-- --
-- Menu base entries -- Menu base entries
-- This file is loaded when a menu handler base is activated (auguria, etc..) -- This file is loaded when a menu handler base is activated (auguria, etc..)
@ -32,7 +32,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 106__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/delais.php?leftmenu=setup', 'Alerts', 1, 'admin', '', '', 2, 6, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 1, 'admin', '', '', 2, 7, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 1, 'admin', '', '', 2, 8, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/pdf.php?leftmenu=setup', 'PDF', 1, 'admin', '', '', 2, 9, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 107__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/pdf.php?leftmenu=setup', 'PDF', 1, 'admin', '', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 10, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 1, 'admin', '', '', 2, 10, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 11, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'Sms', 1, 'admin', '', '', 2, 11, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 12, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'setup\'', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'DictionnarySetup', 1, 'admin', '', '', 2, 12, __ENTITY__);