Revision: 6439
http://care2002.svn.sourceforge.net/care2002/?rev=6439&view=rev
Author: mizuko
Date: 2010-06-30 09:04:35 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/med_depot/medstock-database-functions.php
care2x/branches/gettext/modules/med_depot/medstock-orderbot-pass.php
care2x/branches/gettext/modules/med_depot/medstock-pass.php
care2x/branches/gettext/modules/med_depot/medstock.php
care2x/branches/gettext/modules/products/includes/inc_products_search_result_mod.php
care2x/branches/gettext/modules/products/model/class_product.php
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
care2x/branches/gettext/modules/products/products-archive.php
care2x/branches/gettext/modules/products/products-bestell-hf.php
care2x/branches/gettext/modules/products/products-bestellbot-print.php
care2x/branches/gettext/modules/products/products-bestellbot.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-datenbank-functions-datadelete.php
care2x/branches/gettext/modules/products/products-datenbank-functions-eingabe.php
care2x/branches/gettext/modules/products/products-datenbank-functions-manage.php
care2x/branches/gettext/modules/products/products-datenbank-functions-such.php
care2x/branches/gettext/modules/products/select_dept.php
care2x/branches/gettext/modules/supplier/includes/inc_products_search_result_mod.php
Modified:
care2x/branches/gettext/modules/med_depot/medstock-database-functions.php
===================================================================
--- care2x/branches/gettext/modules/med_depot/medstock-database-functions.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/med_depot/medstock-database-functions.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -60,7 +60,7 @@
<TR bgColor=#eeeeee><td align=center><img <?php echo
createComIcon($root_path,'settings_tree.gif','0','',FALSE) ?>></td>
<TD vAlign=top width=150><FONT
face="Verdana,Helvetica,Arial" size=2><B><nobr>
- <a href="<?php echo $root_path
?>modules/products/products-datenbank-functions-eingabe.php<?php echo
URL_APPEND."&userck=$userck"?>&cat=medlager"><?php echo $LDNewProduct ?></a>
+ <a href="<?php echo $root_path
?>modules/products/products-datenbank-functions-eingabe.php<?php echo
URL_APPEND."&userck=$userck"?>&cat=medstock"><?php echo $LDNewProduct ?></a>
</nobr></B></FONT></TD>
<TD><FONT face="Verdana,Helvetica,Arial"
size=2><?php echo $LDNewProductTxt ?></FONT></TD>
@@ -71,7 +71,7 @@
<TR bgColor=#eeeeee><td align=center><img <?php echo
createComIcon($root_path,'eyeglass.gif','0','',FALSE) ?>></td>
<TD vAlign=top width=150><FONT
face="Verdana,Helvetica,Arial" size=2><B>
- <a href="<?php echo $root_path
?>modules/products/products-datenbank-functions-such.php<?php echo
URL_APPEND."&userck=$userck"?>&cat=medlager"><?php echo $LDSearch
?></a></B></FONT></TD>
+ <a href="<?php echo $root_path
?>modules/products/products-datenbank-functions-such.php<?php echo
URL_APPEND."&userck=$userck"?>&cat=medstock"><?php echo $LDSearch
?></a></B></FONT></TD>
<TD><FONT face="Verdana,Helvetica,Arial"
size=2><nobr><?php echo $LDSearchDb
?></nobr></FONT></TD></TR>
@@ -82,7 +82,7 @@
<TR bgColor=#eeeeee><td align=center><img <?php echo
createComIcon($root_path,'discussions.gif','0','',FALSE) ?>></td>
<TD vAlign=top width=150><FONT
face="Verdana,Helvetica,Arial" size=2><B>
- <a href="<?php echo $root_path
?>modules/products/products-datenbank-functions-manage.php<?php echo
URL_APPEND."&userck=$userck"?>&cat=medlager"><nobr><?php echo $LDManage
?></nobr></a>
+ <a href="<?php echo $root_path
?>modules/products/products-datenbank-functions-manage.php<?php echo
URL_APPEND."&userck=$userck"?>&cat=medstock"><nobr><?php echo $LDManage
?></nobr></a>
</B></FONT></TD>
<TD><FONT face="Verdana,Helvetica,Arial"
size=2><?php echo $LDPharmaDbTxt ?></FONT></TD></TR>
Modified: care2x/branches/gettext/modules/med_depot/medstock-orderbot-pass.php
===================================================================
--- care2x/branches/gettext/modules/med_depot/medstock-orderbot-pass.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/med_depot/medstock-orderbot-pass.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -17,7 +17,7 @@
require_once($root_path.'global_conf/areas_allow.php');
//gjergji
//$allowedarea=&$allow_area['depot'];
-$userck="ck_medlager_user";
+$userck="ck_medstock_user";
$breakfile="medstock.php ".URL_APPEND."&userck=$userck";
$fileforward="medstock.php ".URL_REDIRECT_APPEND."&userck=$userck&stb=1";
$title=$LDMediBotActivate;
Modified: care2x/branches/gettext/modules/med_depot/medstock-pass.php
===================================================================
--- care2x/branches/gettext/modules/med_depot/medstock-pass.php 2010-06-30
09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/med_depot/medstock-pass.php 2010-06-30
09:04:35 UTC (rev 6439)
@@ -19,7 +19,7 @@
//$allowedarea=&$allow_area['depot'];
-$append=URL_REDIRECT_APPEND."&cat=medlager&from=$src&userck=";
+$append=URL_REDIRECT_APPEND."&cat=medstock&from=$src&userck=";
switch($mode) {
case "archive":$title=$LDOrderArchive;
Modified: care2x/branches/gettext/modules/med_depot/medstock.php
===================================================================
--- care2x/branches/gettext/modules/med_depot/medstock.php 2010-06-30
09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/med_depot/medstock.php 2010-06-30
09:04:35 UTC (rev 6439)
@@ -64,7 +64,7 @@
if($stb)
echo '
function startbot() {
-
medibotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-bestellbot.php'.URL_REDIRECT_APPEND.'&cat=medlager&userck='.$userck.'","medibotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes");
+
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");
}
';
?>
@@ -133,7 +133,7 @@
# Assign the submenu to the mainframe center block
- $smarty->assign('sMainBlockIncludeFile','med_depot/submenu_medlager.tpl');
+ $smarty->assign('sMainBlockIncludeFile','med_depot/submenu_medstock.tpl');
/**
* show Template
Modified:
care2x/branches/gettext/modules/products/includes/inc_products_search_result_mod.php
===================================================================
---
care2x/branches/gettext/modules/products/includes/inc_products_search_result_mod.php
2010-06-30 09:02:19 UTC (rev 6438)
+++
care2x/branches/gettext/modules/products/includes/inc_products_search_result_mod.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -27,7 +27,7 @@
case "pharma" :
$imgpath = $root_path . "uplodas/pharma/img/";
break;
- case "medlager" :
+ case "medstock" :
$imgpath = $root_path . "uplodas/med_depot/img/";
break;
}
Modified: care2x/branches/gettext/modules/products/model/class_product.php
===================================================================
--- care2x/branches/gettext/modules/products/model/class_product.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/model/class_product.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -175,7 +175,7 @@
function useOrderList($type){
if($type=='pharma'){
$this->coretable=$this->tb_polist;
- }elseif($type=='medlager'){
+ }elseif($type=='medstock'){
$this->coretable=$this->tb_molist;
}else{return false;}
}
@@ -191,7 +191,7 @@
if($type=='pharma'){
$this->coretable=$this->tb_pocat;
$this->ref_array=$this->fld_ocat;
- }elseif($type=='medlager' or $type=='supply'){
+ }elseif($type=='medstock' or $type=='supply'){
$this->coretable=$this->tb_mocat;
$this->ref_array=$this->fld_ocat;
}else{return false;}
@@ -208,7 +208,7 @@
if($type=='pharma'){
$this->coretable=$this->tb_pmain;
$this->ref_array=$this->fld_prodmain;
- }elseif($type=='medlager' or $type='supply'){
+ }elseif($type=='medstock' or $type='supply'){
$this->coretable=$this->tb_mmain;
$this->ref_array=$this->fld_prodmain;
}else{return false;}
Modified:
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
===================================================================
---
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
2010-06-30 09:02:19 UTC (rev 6438)
+++
care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -32,7 +32,7 @@
$dbtableSub='care_pharma_orderlist_sub';
$breakfile=$root_path.'modules/pharmacy/apotheke.php?sid='.$sid.'&lang='.$lang;
break;
- case 'medlager':
+ case 'medstock':
$title=$LDMedDepot;
$dbtable='care_med_orderlist';
$dbtableSub='care_med_orderlist_sub';
Modified: care2x/branches/gettext/modules/products/products-archive.php
===================================================================
--- care2x/branches/gettext/modules/products/products-archive.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/products-archive.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -27,7 +27,7 @@
$dbtable='care_pharma_orderlist';
$breakfile=$root_path.'modules/pharmacy/apotheke.php'.URL_APPEND;
break;
- case 'medlager':
+ case 'medstock':
$title="$LDMedDepot $LDOrderArchive";
$dbtable='care_med_orderlist';
$breakfile=$root_path.'modules/med_depot/medstock.php '.URL_APPEND;
Modified: care2x/branches/gettext/modules/products/products-bestell-hf.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestell-hf.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/products-bestell-hf.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -17,7 +17,7 @@
{
case "pharma":
$breakfile=$root_path."modules/pharmacy/apotheke.php".URL_APPEND;
break;
- case "medlager": $breakfile=$root_path."modules/med_depot/medstock.php
".URL_APPEND;
+ case "medstock": $breakfile=$root_path."modules/med_depot/medstock.php
".URL_APPEND;
break;
}
Modified: care2x/branches/gettext/modules/products/products-bestellbot-print.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellbot-print.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/products-bestellbot-print.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -35,7 +35,7 @@
$dbtable='care_pharma_orderlist';
$dbtablesub='care_pharma_orderlist_sub';
break;
- case 'medlager':
+ case 'medstock':
$title="$LDMedDepot - $LDOrderBotActivate
$LDAck";
$dbtable='care_med_orderlist';
$dbtablesub='care_med_orderlist_sub';
@@ -85,7 +85,7 @@
$dbtableupdate='care_pharma_products_main_sub';
$dbmovements='care_pharma_products_main_movements';
break;
- case 'medlager':
+ case 'medstock':
$title="$LDMedDepot - $LDOrderBotActivate $LDAck";
$dbtableupdate='care_med_products_main_sub';
$tableupdatepharmacy='care_pharma_products_main_sub';
@@ -111,7 +111,7 @@
//end:gjergji
//gjergji:
- if($cat=='medlager'){
+ if($cat=='medstock'){
$ergebnis->MoveFirst();
while ($dept = $ergebnis->FetchRow()) {
$dstmp =
explode('/',$dept['expiry_date']);
Modified: care2x/branches/gettext/modules/products/products-bestellbot.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellbot.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/products-bestellbot.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -16,7 +16,7 @@
$bot_name = $LDPharmaOrderBot;
$dbtable = 'care_pharma_orderlist';
break;
- case 'medlager':if ($_COOKIE[$local_user . $sid] == null) $cat = "";
+ case 'medstock':if ($_COOKIE[$local_user . $sid] == null) $cat = "";
$title = "$LDMedDepot - $LDOrderBotActivate";
$bot_name = $LDDepotOrderBot;
$dbtable = 'care_med_orderlist';
Modified:
care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -40,7 +40,7 @@
case 'pharma': $title=$LDPharmacy;
$breakfile=$root_path."modules/pharmacy/apotheke.php".URL_APPEND;
break;
- case 'medlager':$title=$LDMedDepot;
+ case 'medstock':$title=$LDMedDepot;
$breakfile=$root_path."modules/med_depot/medstock.php ".URL_APPEND;
break;
default: $invalid=1;
Modified: care2x/branches/gettext/modules/products/products-bestellkatalog.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellkatalog.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/products-bestellkatalog.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -198,7 +198,7 @@
<td><a
href="'.$thisfile.URL_APPEND.'&dept_nr='.$dept_nr.'&order_nr='.$order_nr.'&mode=delete&cat='.$cat.'&keyword='.$content['item_no'].'&userck='.$userck.'"
><img '.$img_delete.' alt="'.$LDRemoveArticle.'"></a></td>
</tr>';
//gjergji:get how many of this product do i have in the
care_med/pharma_producs_main_sub
- if($cat=='medlager'){
+ if($cat=='medstock'){
$ergebnis_sub=&$product_obj_sub->ActualOrderCatalogProducts('medsub',$content['bestellnum']);
}else{
$ergebnis_sub=&$product_obj_sub->ActualOrderCatalogPharma('pharmasub',$content['bestellnum'],$pharma_nr['pharma_dept_nr']);
Modified: care2x/branches/gettext/modules/products/products-bestellkorb.php
===================================================================
--- care2x/branches/gettext/modules/products/products-bestellkorb.php
2010-06-30 09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/products-bestellkorb.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -12,7 +12,7 @@
if($cat=='pharma'){
$dbtable='care_pharma_orderlist';
$title=$LDPharmacy;
-}elseif($cat=='medlager'){
+}elseif($cat=='medstock'){
$dbtable='care_med_orderlist';
$title=$LDMedDepot;
}
Modified:
care2x/branches/gettext/modules/products/products-datenbank-functions-datadelete.php
===================================================================
---
care2x/branches/gettext/modules/products/products-datenbank-functions-datadelete.php
2010-06-30 09:02:19 UTC (rev 6438)
+++
care2x/branches/gettext/modules/products/products-datenbank-functions-datadelete.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -27,7 +27,7 @@
$imgpath=$root_path."uplodas/pharma/img/";
$breakfile=$root_path."modules/pharmacy/apotheke-datenbank-functions.php?sid=$sid&lang=$lang&userck=$userck";
break;
- case "medlager":
+ case "medstock":
$title=$LDMedDepot;
$dbtable="care_med_products_main";
$imgpath=$root_path."uplodas/med_depot/img/";
Modified:
care2x/branches/gettext/modules/products/products-datenbank-functions-eingabe.php
===================================================================
---
care2x/branches/gettext/modules/products/products-datenbank-functions-eingabe.php
2010-06-30 09:02:19 UTC (rev 6438)
+++
care2x/branches/gettext/modules/products/products-datenbank-functions-eingabe.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -17,7 +17,7 @@
$breakfile=$root_path."modules/pharmacy/apotheke-datenbank-functions.php".URL_APPEND."&userck=$userck";
$imgpath=$root_path."uplodas/pharma/img/";
break;
- case "medlager":
+ case "medstock":
$title=$LDMedDepot;
$breakfile=$root_path."modules/med_depot/medstock-database-functions.php".URL_APPEND."&userck=$userck";
$imgpath=$root_path."uplodas/med_depot/img/";
Modified:
care2x/branches/gettext/modules/products/products-datenbank-functions-manage.php
===================================================================
---
care2x/branches/gettext/modules/products/products-datenbank-functions-manage.php
2010-06-30 09:02:19 UTC (rev 6438)
+++
care2x/branches/gettext/modules/products/products-datenbank-functions-manage.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -22,7 +22,7 @@
$breakfile=$root_path."modules/pharmacy/apotheke-datenbank-functions.php".URL_APPEND."&userck=$userck";
$imgpath=$root_path."uplodas/pharma/img/";
break;
- case "medlager":
+ case "medstock":
$title=$LDMedDepot;
$breakfile=$root_path."modules/med_depot/medstock-database-functions.php".URL_APPEND."&userck=$userck";
$imgpath=$root_path."uplodas/med_depot/img/";
Modified:
care2x/branches/gettext/modules/products/products-datenbank-functions-such.php
===================================================================
---
care2x/branches/gettext/modules/products/products-datenbank-functions-such.php
2010-06-30 09:02:19 UTC (rev 6438)
+++
care2x/branches/gettext/modules/products/products-datenbank-functions-such.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -24,7 +24,7 @@
$breakfile = $root_path .
"modules/pharmacy/apotheke-datenbank-functions.php" . URL_APPEND .
"&userck=$userck";
$imgpath = $root_path . "uplodas/pharma/img/";
break;
- case "medlager" :
+ case "medstock" :
$title = $LDMedDepot;
$breakfile = $root_path .
"modules/med_depot/medstock-database-functions.php" . URL_APPEND .
"&userck=$userck";
$imgpath = $root_path . "uplodas/med_depot/img/";
Modified: care2x/branches/gettext/modules/products/select_dept.php
===================================================================
--- care2x/branches/gettext/modules/products/select_dept.php 2010-06-30
09:02:19 UTC (rev 6438)
+++ care2x/branches/gettext/modules/products/select_dept.php 2010-06-30
09:04:35 UTC (rev 6439)
@@ -42,13 +42,13 @@
//begin:gjergji
//if i'm the depot then i only take the pharmacy
//else, all the departments
-if($cat=='medlager')
+if($cat=='medstock')
$dept=$dept_obj->getAllPharmacy();
elseif($cat=='pharma')
$dept=$dept_obj->getAllMedical();
//end:gjergji
-if($cat=='medlager')
+if($cat=='medstock')
$title=$LDSelectPharma;
elseif($cat=='pharma')
$title=$LDSelectDept;
@@ -83,7 +83,7 @@
$smarty->assign('sWindowTitle',$title);
$smarty->assign('sMascotImg','<img
'.createMascot($root_path,'mascot1_r.gif','0','bottom').' align="absmiddle">');
-if($cat=='medlager')
+if($cat=='medstock')
$smarty->assign('LDPlsSelectDept',$LDPlsSelectFarma);
elseif($cat=='pharma')
$smarty->assign('LDPlsSelectDept',$LDPlsSelectDept);
Modified:
care2x/branches/gettext/modules/supplier/includes/inc_products_search_result_mod.php
===================================================================
---
care2x/branches/gettext/modules/supplier/includes/inc_products_search_result_mod.php
2010-06-30 09:02:19 UTC (rev 6438)
+++
care2x/branches/gettext/modules/supplier/includes/inc_products_search_result_mod.php
2010-06-30 09:04:35 UTC (rev 6439)
@@ -27,7 +27,7 @@
case "pharma" :
$imgpath = $root_path . "uplodas/pharma/img/";
break;
- case "medlager" :
+ case "medstock" :
$imgpath = $root_path . "uplodas/med_depot/img/";
break;
}
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
