Revision: 6483 http://care2002.svn.sourceforge.net/care2002/?rev=6483&view=rev Author: mizuko Date: 2010-06-30 12:18:32 +0000 (Wed, 30 Jun 2010)
Log Message: ----------- see #54 Modified Paths: -------------- care2x/branches/gettext/modules/medstock/medstock-pass.php care2x/branches/gettext/modules/medstock/medstock.php care2x/branches/gettext/modules/pharmacy/pharmacy.php care2x/branches/gettext/modules/products/products-bestellbot.php care2x/branches/gettext/modules/products/products-order-print.php Modified: care2x/branches/gettext/modules/medstock/medstock-pass.php =================================================================== --- care2x/branches/gettext/modules/medstock/medstock-pass.php 2010-06-30 12:17:21 UTC (rev 6482) +++ care2x/branches/gettext/modules/medstock/medstock-pass.php 2010-06-30 12:18:32 UTC (rev 6483) @@ -37,7 +37,7 @@ $allowedarea[] = '_a_1_meddepotdbadmin'; $src="medibotpass"; $userck="ck_prod_bot_user"; - $fileforward=$root_path."modules/products/products-bestellbot.php".$append.$userck; + $fileforward=$root_path."modules/products/products-orderbot.php".$append.$userck; break; case "catalog": $title=$LDOrderCat; $allowedarea[] = '_a_1_meddepotdbadmin'; Modified: care2x/branches/gettext/modules/medstock/medstock.php =================================================================== --- care2x/branches/gettext/modules/medstock/medstock.php 2010-06-30 12:17:21 UTC (rev 6482) +++ care2x/branches/gettext/modules/medstock/medstock.php 2010-06-30 12:18:32 UTC (rev 6483) @@ -64,7 +64,7 @@ if($stb) echo ' function startbot() { - medibotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-bestellbot.php'.URL_REDIRECT_APPEND.'&cat=medstock&userck='.$userck.'","medibotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); + medibotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-orderbot.php'.URL_REDIRECT_APPEND.'&cat=medstock&userck='.$userck.'","medibotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); } '; ?> Modified: care2x/branches/gettext/modules/pharmacy/pharmacy.php =================================================================== --- care2x/branches/gettext/modules/pharmacy/pharmacy.php 2010-06-30 12:17:21 UTC (rev 6482) +++ care2x/branches/gettext/modules/pharmacy/pharmacy.php 2010-06-30 12:18:32 UTC (rev 6483) @@ -75,7 +75,7 @@ if($stb) echo ' function startbot() { - pharmabotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-bestellbot.php'.URL_REDIRECT_APPEND.'&cat=pharma&userck='.$userck.'","pharmabotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); + pharmabotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-orderbot.php'.URL_REDIRECT_APPEND.'&cat=pharma&userck='.$userck.'","pharmabotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); } '; Modified: care2x/branches/gettext/modules/products/products-bestellbot.php =================================================================== --- care2x/branches/gettext/modules/products/products-bestellbot.php 2010-06-30 12:17:21 UTC (rev 6482) +++ care2x/branches/gettext/modules/products/products-bestellbot.php 2010-06-30 12:18:32 UTC (rev 6483) @@ -38,7 +38,7 @@ <?php echo setCharSet(); ?> -<meta http-equiv="refresh" content="15,url=products-bestellbot.php?<?php echo "$sid&lang=$lang&userck=$userck"; +<meta http-equiv="refresh" content="15,url=products-orderbot.php?<?php echo "$sid&lang=$lang&userck=$userck"; ?>&cat=<?php echo $cat ?>"> <title><?php echo $title ?></title> Modified: care2x/branches/gettext/modules/products/products-order-print.php =================================================================== --- care2x/branches/gettext/modules/products/products-order-print.php 2010-06-30 12:17:21 UTC (rev 6482) +++ care2x/branches/gettext/modules/products/products-order-print.php 2010-06-30 12:18:32 UTC (rev 6483) @@ -182,8 +182,8 @@ this.location.replace("products-order-print.php<?php echo URL_REDIRECT_APPEND."&userck=$userck&mode=archive&cat=$cat&dept_nr=$dept_nr&order_nr=$order_nr&status=$status&clerk="; ?>"+c); } function parentref(n) { - if(n==1) window.opener.location.replace("products-bestellbot.php<?php echo URL_REDIRECT_APPEND."&userck=$userck"?>&cat=<?php echo $cat ?>&nofocus="+n+"&showlist=1"); - else window.opener.location.replace("products-bestellbot.php<?php echo URL_REDIRECT_APPEND."&userck=$userck"?>&cat=<?php echo $cat ?>&showlist=1"); + if(n==1) window.opener.location.replace("products-orderbot.php<?php echo URL_REDIRECT_APPEND."&userck=$userck"?>&cat=<?php echo $cat ?>&nofocus="+n+"&showlist=1"); + else window.opener.location.replace("products-orderbot.php<?php echo URL_REDIRECT_APPEND."&userck=$userck"?>&cat=<?php echo $cat ?>&showlist=1"); // <?php if($statseen || $deltodo) { ?> setTimeout("parentref('')",10000); 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