Revision: 6485
http://care2002.svn.sourceforge.net/care2002/?rev=6485&view=rev
Author: mizuko
Date: 2010-06-30 12:21:18 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/medstock/medstock-pass.php
care2x/branches/gettext/modules/nursing/nursing-getmedx.php
care2x/branches/gettext/modules/or_logbook/op-log-container-entry-manual.php
care2x/branches/gettext/modules/or_logbook/op-log-container-list.php
care2x/branches/gettext/modules/or_logbook/op-log-material-entry-manual.php
care2x/branches/gettext/modules/or_logbook/op-log-material-list.php
care2x/branches/gettext/modules/pharmacy/apotheke-pass.php
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php
care2x/branches/gettext/modules/products/products-bestellkatalog.php
care2x/branches/gettext/modules/products/products-bestellkorb.php
care2x/branches/gettext/modules/products/products-bestellung.php
care2x/branches/gettext/modules/products/products-orderlist-final.php
care2x/branches/gettext/modules/products/select_dept.php
care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
Modified: care2x/branches/gettext/modules/medstock/medstock-pass.php
===================================================================
--- care2x/branches/gettext/modules/medstock/medstock-pass.php 2010-06-30
12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/medstock/medstock-pass.php 2010-06-30
12:21:18 UTC (rev 6485)
@@ -43,7 +43,7 @@
$allowedarea[] =
'_a_1_meddepotdbadmin';
$src="catalogpass";
$userck="ck_prod_order_user";
-
$fileforward=$root_path."modules/products/products-bestellkatalog-edit.php".$append.$userck."&target=catalog&from=".$src;
+
$fileforward=$root_path."modules/products/products-ordercatalog-edit.php".$append.$userck."&target=catalog&from=".$src;
break;
case "supplier": $title=$LDSupplier;
$allowedarea[] =
'_a_1_meddepotdbadmin';
Modified: care2x/branches/gettext/modules/nursing/nursing-getmedx.php
===================================================================
--- care2x/branches/gettext/modules/nursing/nursing-getmedx.php 2010-06-30
12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/nursing/nursing-getmedx.php 2010-06-30
12:21:18 UTC (rev 6485)
@@ -405,7 +405,7 @@
}
function popinfo(b) {
-
urlholder="../products/products-bestellkatalog-popinfo.php?sid=7071bab054d376600a2ecf70ac6128a5&lang=sq&keyword="+b+"&mode=search&cat=pharma";
+
urlholder="../products/products-ordercatalog-popinfo.php?sid=7071bab054d376600a2ecf70ac6128a5&lang=sq&keyword="+b+"&mode=search&cat=pharma";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified:
care2x/branches/gettext/modules/or_logbook/op-log-container-entry-manual.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-log-container-entry-manual.php
2010-06-30 12:19:17 UTC (rev 6484)
+++
care2x/branches/gettext/modules/or_logbook/op-log-container-entry-manual.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -82,7 +82,7 @@
function popinfo(b)
{
- urlholder="products-bestellkatalog-popinfo.php<?php echo URL_APPEND;
?>&keyword="+b+"&mode=search&cat=pharma";
+ urlholder="products-ordercatalog-popinfo.php<?php echo URL_APPEND;
?>&keyword="+b+"&mode=search&cat=pharma";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified: care2x/branches/gettext/modules/or_logbook/op-log-container-list.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-log-container-list.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/or_logbook/op-log-container-list.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -193,7 +193,7 @@
function popinfo(b)
{
- urlholder="products-bestellkatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=steri";
+ urlholder="products-ordercatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=steri";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified:
care2x/branches/gettext/modules/or_logbook/op-log-material-entry-manual.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-log-material-entry-manual.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/or_logbook/op-log-material-entry-manual.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -78,7 +78,7 @@
function popinfo(b)
{
- urlholder="products-bestellkatalog-popinfo.php?sid=<?php echo $sid;
?>&keyword="+b+"&mode=search&cat=pharma";
+ urlholder="products-ordercatalog-popinfo.php?sid=<?php echo $sid;
?>&keyword="+b+"&mode=search&cat=pharma";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified: care2x/branches/gettext/modules/or_logbook/op-log-material-list.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-log-material-list.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/or_logbook/op-log-material-list.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -231,7 +231,7 @@
function popinfo(b)
{
- urlholder="products-bestellkatalog-popinfo.php<?php echo URL_APPEND;
?>&keyword="+b+"&mode=search&cat=pharma";
+ urlholder="products-ordercatalog-popinfo.php<?php echo URL_APPEND;
?>&keyword="+b+"&mode=search&cat=pharma";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified: care2x/branches/gettext/modules/pharmacy/apotheke-pass.php
===================================================================
--- care2x/branches/gettext/modules/pharmacy/apotheke-pass.php 2010-06-30
12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/pharmacy/apotheke-pass.php 2010-06-30
12:21:18 UTC (rev 6485)
@@ -42,7 +42,7 @@
$allowedarea[] =
'_a_1_pharmadbadmin';
$src="catalogpass";
$userck="ck_prod_order_user";
-
$fileforward=$root_path."modules/products/products-bestellkatalog-edit.php".$append.$userck."&target=catalog&from=".$src;
+
$fileforward=$root_path."modules/products/products-ordercatalog-edit.php".$append.$userck."&target=catalog&from=".$src;
break;
case "bot": $title=$LDPharmaOrderBot;
$allowedarea[] =
'_a_1_pharmadbadmin';
Modified:
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
===================================================================
---
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
2010-06-30 12:19:17 UTC (rev 6484)
+++
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -100,7 +100,7 @@
}
function popinfo(b) {
- urlholder="products-bestellkatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&cat=<?php echo $cat ?>&keyword="+b+"&mode=search";
+ urlholder="products-ordercatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&cat=<?php echo $cat ?>&keyword="+b+"&mode=search";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified:
care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -104,7 +104,7 @@
<script language=javascript>
function popinfo(b)
{
- urlholder="products-bestellkatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat ?>";
+ urlholder="products-ordercatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat ?>";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified: care2x/branches/gettext/modules/products/products-bestellkatalog.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellkatalog.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/products/products-bestellkatalog.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -63,7 +63,7 @@
<script language=javascript>
function popinfo(b) {
- urlholder="products-bestellkatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat; ?>";
+ urlholder="products-ordercatalog-popinfo.php<?php echo
URL_REDIRECT_APPEND; ?>&keyword="+b+"&mode=search&cat=<?php echo $cat; ?>";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified: care2x/branches/gettext/modules/products/products-bestellkorb.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellkorb.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/products/products-bestellkorb.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -57,7 +57,7 @@
<script language=javascript>
function popinfo(b){
- urlholder="products-bestellkatalog-popinfo.php?sid=<?php echo
"$sid&lang=$lang&userck=$userck"; ?>&keyword="+b+"&mode=search&cat=<?php echo
$cat ?>";
+ urlholder="products-ordercatalog-popinfo.php?sid=<?php echo
"$sid&lang=$lang&userck=$userck"; ?>&keyword="+b+"&mode=search&cat=<?php echo
$cat ?>";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
Modified: care2x/branches/gettext/modules/products/products-bestellung.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellung.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/products/products-bestellung.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -44,7 +44,7 @@
$smarty->assign ( 'sHeaderSource',
"src=\"products-order-header.php?sid=$sid&lang=$lang&cat=$cat&userck=$userck\""
);
$smarty->assign ( 'sBasketSource',
"src=\"products-bestellkorb.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&itwassent=$itwassent&cat=$cat&userck=$userck\""
);
-$smarty->assign ( 'sCatalogSource',
"src=\"products-bestellkatalog.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&cat=$cat&userck=$userck\""
);
+$smarty->assign ( 'sCatalogSource',
"src=\"products-ordercatalog.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&cat=$cat&userck=$userck\""
);
$smarty->assign ( 'sBaseFramesetTemplate','products/ordering_frameset.tpl' );
Modified: care2x/branches/gettext/modules/products/products-orderlist-final.php
===================================================================
--- care2x/branches/gettext/modules/products/products-orderlist-final.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/products/products-orderlist-final.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -122,7 +122,7 @@
<script language=javascript>
function popinfo(b) {
- urlholder="products-bestellkatalog-popinfo.php<?php echo URL_APPEND;
?>&cat=<?php echo $cat; ?>&keyword="+b+"&mode=search";
+ urlholder="products-ordercatalog-popinfo.php<?php echo URL_APPEND;
?>&cat=<?php echo $cat; ?>&keyword="+b+"&mode=search";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
function checkform(d) {
@@ -142,7 +142,7 @@
if (($mode=='send')&&($sendok)) {
$idbuf=$order_nr + 1;
echo "function hide_bcat() {
-
window.parent.BESTELLKATALOG.location.replace('products-bestellkatalog.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&userck=$userck&cat=$cat&order_nr=$idbuf')
+
window.parent.BESTELLKATALOG.location.replace('products-ordercatalog.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&userck=$userck&cat=$cat&order_nr=$idbuf')
}";
}
?>
Modified: care2x/branches/gettext/modules/products/select_dept.php
===================================================================
--- care2x/branches/gettext/modules/products/select_dept.php 2010-06-30
12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/products/select_dept.php 2010-06-30
12:21:18 UTC (rev 6485)
@@ -54,7 +54,7 @@
$title=$LDSelectDept;
# Set forward file
switch($target){
- case 'catalog':
$fileforward=$root_path."modules/products/products-bestellkatalog-edit.php".URL_APPEND."&cat=$cat";
+ case 'catalog':
$fileforward=$root_path."modules/products/products-ordercatalog-edit.php".URL_APPEND."&cat=$cat";
break;
default :
$fileforward=$root_path."modules/products/products-bestellung.php".URL_APPEND."&cat=$cat";
}
Modified: care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
===================================================================
--- care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
2010-06-30 12:19:17 UTC (rev 6484)
+++ care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
2010-06-30 12:21:18 UTC (rev 6485)
@@ -84,7 +84,7 @@
<script language=javascript>
function popinfo(b)
{
- urlholder="products-bestellkatalog-popinfo.php<?php echo URL_APPEND;
?>&cat=<?php echo $cat; ?>&keyword="+b+"&mode=search";
+ urlholder="products-ordercatalog-popinfo.php<?php echo URL_APPEND;
?>&cat=<?php echo $cat; ?>&keyword="+b+"&mode=search";
ordercatwin=window.open(urlholder,"ordercat","width=850,height=550,menubar=no,resizable=yes,scrollbars=yes");
}
function checkform(d)
@@ -109,7 +109,7 @@
echo "
function hide_bcat()
{
-
window.parent.BESTELLKATALOG.location.replace('products-bestellkatalog.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&userck=$userck&cat=$cat&order_nr=$idbuf')
+
window.parent.BESTELLKATALOG.location.replace('products-ordercatalog.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&userck=$userck&cat=$cat&order_nr=$idbuf')
}";
}
?>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers
