Revision: 6488
http://care2002.svn.sourceforge.net/care2002/?rev=6488&view=rev
Author: mizuko
Date: 2010-06-30 12:25:28 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/medstock/medstock-pass.php
care2x/branches/gettext/modules/pharmacy/apotheke-pass.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
Added Paths:
-----------
care2x/branches/gettext/modules/products/products-order.php
Removed Paths:
-------------
care2x/branches/gettext/modules/products/products-bestellung.php
Modified: care2x/branches/gettext/modules/medstock/medstock-pass.php
===================================================================
--- care2x/branches/gettext/modules/medstock/medstock-pass.php 2010-06-30
12:23:59 UTC (rev 6487)
+++ care2x/branches/gettext/modules/medstock/medstock-pass.php 2010-06-30
12:25:28 UTC (rev 6488)
@@ -63,7 +63,7 @@
$src="orderpass";
$mode="order";
$userck="ck_prod_order_user";
-
$fileforward=$root_path."modules/products/products-bestellung.php".$append.$userck;
+
$fileforward=$root_path."modules/products/products-order.php".$append.$userck;
}
$thisfile=basename(__FILE__);
Modified: care2x/branches/gettext/modules/pharmacy/apotheke-pass.php
===================================================================
--- care2x/branches/gettext/modules/pharmacy/apotheke-pass.php 2010-06-30
12:23:59 UTC (rev 6487)
+++ care2x/branches/gettext/modules/pharmacy/apotheke-pass.php 2010-06-30
12:25:28 UTC (rev 6488)
@@ -24,7 +24,7 @@
$src="orderpass";
$mode="order";
$userck="ck_prod_order_user";
-
$fileforward=$root_path."modules/products/products-bestellung.php".$append.$userck."&from=".$src;
+
$fileforward=$root_path."modules/products/products-order.php".$append.$userck."&from=".$src;
break;
case "archive":$title=$LDOrderArchive;
$allowedarea[] =
'_a_1_pharmadbadmin';
Deleted: care2x/branches/gettext/modules/products/products-bestellung.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellung.php
2010-06-30 12:23:59 UTC (rev 6487)
+++ care2x/branches/gettext/modules/products/products-bestellung.php
2010-06-30 12:25:28 UTC (rev 6488)
@@ -1,53 +0,0 @@
-<?php
-error_reporting ( E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR );
-require ('./roots.php');
-require ($root_path . 'include/helpers/inc_environment_global.php');
-/**
- * CARE2X Integrated Hospital Information System Deployment 2.1 - 2004-10-02
- * GNU General Public License
- * Copyright 2002,2003,2004,2005 Elpidio Latorilla
- * [email protected],
- *
- * See the file "copy_notice.txt" for the licence notice
- */
-$lang_tables [] = 'prompt.php';
-define ( 'LANG_FILE', 'products.php' );
-$local_user = 'ck_prod_order_user';
-require_once ($root_path . 'include/helpers/inc_front_chain_lang.php');
-include($root_path.'include/helpers/inc_passcheck.php');
-if (isset ( $_SESSION ['department_nr'] ) && $_SESSION ['department_nr'] !=
'') {
- $dept_nr = $_SESSION ['department_nr'] [0];
-
-}else{
- echo '<FONT SIZE="+4" color="navy">' . $LDNoDepartmentAssociation .
'</font>';
- exit ();
-}
-
-
-//$db->debug=1;
-
-
-/**
- * LOAD Smarty
- */
-
-// Note: it is advisable to load this after the inc_front_chain_lang.php so
-// that the smarty script can use the user configured template theme
-
-require_once ($root_path . 'gui/smarty_template/smarty_care.class.php');
-$smarty = new smarty_care ( 'common', TRUE, FALSE, FALSE );
-
-// Window bar title
-$smarty->assign ( 'sWindowTitle', '' );
-
-// Assign frameset source file
-
-$smarty->assign ( 'sHeaderSource',
"src=\"products-order-header.php?sid=$sid&lang=$lang&cat=$cat&userck=$userck\""
);
-$smarty->assign ( 'sBasketSource',
"src=\"products-basket.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&itwassent=$itwassent&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' );
-
-$smarty->display ( 'common/baseframe.tpl' );
-?>
-
Copied: care2x/branches/gettext/modules/products/products-order.php (from rev
6487, care2x/branches/gettext/modules/products/products-bestellung.php)
===================================================================
--- care2x/branches/gettext/modules/products/products-order.php
(rev 0)
+++ care2x/branches/gettext/modules/products/products-order.php 2010-06-30
12:25:28 UTC (rev 6488)
@@ -0,0 +1,53 @@
+<?php
+error_reporting ( E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR );
+require ('./roots.php');
+require ($root_path . 'include/helpers/inc_environment_global.php');
+/**
+ * CARE2X Integrated Hospital Information System Deployment 2.1 - 2004-10-02
+ * GNU General Public License
+ * Copyright 2002,2003,2004,2005 Elpidio Latorilla
+ * [email protected],
+ *
+ * See the file "copy_notice.txt" for the licence notice
+ */
+$lang_tables [] = 'prompt.php';
+define ( 'LANG_FILE', 'products.php' );
+$local_user = 'ck_prod_order_user';
+require_once ($root_path . 'include/helpers/inc_front_chain_lang.php');
+include($root_path.'include/helpers/inc_passcheck.php');
+if (isset ( $_SESSION ['department_nr'] ) && $_SESSION ['department_nr'] !=
'') {
+ $dept_nr = $_SESSION ['department_nr'] [0];
+
+}else{
+ echo '<FONT SIZE="+4" color="navy">' . $LDNoDepartmentAssociation .
'</font>';
+ exit ();
+}
+
+
+//$db->debug=1;
+
+
+/**
+ * LOAD Smarty
+ */
+
+// Note: it is advisable to load this after the inc_front_chain_lang.php so
+// that the smarty script can use the user configured template theme
+
+require_once ($root_path . 'gui/smarty_template/smarty_care.class.php');
+$smarty = new smarty_care ( 'common', TRUE, FALSE, FALSE );
+
+// Window bar title
+$smarty->assign ( 'sWindowTitle', '' );
+
+// Assign frameset source file
+
+$smarty->assign ( 'sHeaderSource',
"src=\"products-order-header.php?sid=$sid&lang=$lang&cat=$cat&userck=$userck\""
);
+$smarty->assign ( 'sBasketSource',
"src=\"products-basket.php?sid=$sid&lang=$lang&dept_nr=$dept_nr&order_nr=$order_nr&itwassent=$itwassent&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' );
+
+$smarty->display ( 'common/baseframe.tpl' );
+?>
+
Modified: care2x/branches/gettext/modules/products/products-orderlist-final.php
===================================================================
--- care2x/branches/gettext/modules/products/products-orderlist-final.php
2010-06-30 12:23:59 UTC (rev 6487)
+++ care2x/branches/gettext/modules/products/products-orderlist-final.php
2010-06-30 12:25:28 UTC (rev 6488)
@@ -268,7 +268,7 @@
<p><font face=Verdana,Arial size=1 color="#000080"><a
href="'.$breakfile.'" target="_parent">
<img '.createComIcon($root_path,'arrow-blu.gif','0').'>
'.$LDEndOrder.'</a>
<p>
- <a
href="products-bestellung.php'.URL_APPEND.'&dept_nr='.$dept_nr.'&cat='.$cat.'&userck='.$userck.'"
target="_parent"><img '.createComIcon($root_path,'arrow-blu.gif','0').'>
'.$LDCreateBasket.'</a>
+ <a
href="products-order.php'.URL_APPEND.'&dept_nr='.$dept_nr.'&cat='.$cat.'&userck='.$userck.'"
target="_parent"><img '.createComIcon($root_path,'arrow-blu.gif','0').'>
'.$LDCreateBasket.'</a>
</font>';
}
}
Modified: care2x/branches/gettext/modules/products/select_dept.php
===================================================================
--- care2x/branches/gettext/modules/products/select_dept.php 2010-06-30
12:23:59 UTC (rev 6487)
+++ care2x/branches/gettext/modules/products/select_dept.php 2010-06-30
12:25:28 UTC (rev 6488)
@@ -56,7 +56,7 @@
switch($target){
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";
+ default :
$fileforward=$root_path."modules/products/products-order.php".URL_APPEND."&cat=$cat";
}
# Start Smarty templating here
Modified: care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
===================================================================
--- care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
2010-06-30 12:23:59 UTC (rev 6487)
+++ care2x/branches/gettext/modules/supplier/supply-orderlist-final.php
2010-06-30 12:25:28 UTC (rev 6488)
@@ -257,7 +257,7 @@
<p><font face=Verdana,Arial size=1
color="#000080"><a href="'.$breakfile.'" target="_parent">
<img
'.createComIcon($root_path,'arrow-blu.gif','0').'> '.$LDEndOrder.'</a>
<p>
- <a
href="products-bestellung.php'.URL_APPEND.'&dept_nr='.$dept_nr.'&cat='.$cat.'&userck='.$userck.'"
target="_parent"><img '.createComIcon($root_path,'arrow-blu.gif','0').'>
'.$LDCreateBasket.'</a>
+ <a
href="products-order.php'.URL_APPEND.'&dept_nr='.$dept_nr.'&cat='.$cat.'&userck='.$userck.'"
target="_parent"><img '.createComIcon($root_path,'arrow-blu.gif','0').'>
'.$LDCreateBasket.'</a>
</font>';
}
}
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
