[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property add_workorder.php,1.8,1.9 edit_workorde
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property add_workorder.php,1.8,1.9 edit_workorder.php,1.7,1.8 invoice_paid.php,1.6,1.7 edit_project.php,1.3,1.4 add_project.php,1.2,1.3 invoice_consume.php,1.2,1.3 id_controle.php,1.1,1.2 |
|
Date: |
Sat, 26 Oct 2002 05:03:41 -0400 |
Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv21733
Modified Files:
add_workorder.php edit_workorder.php invoice_paid.php
edit_project.php add_project.php invoice_consume.php
id_controle.php
Log Message:
no message
Index: add_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_workorder.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** add_workorder.php 2 Oct 2002 17:00:00 -0000 1.8
--- add_workorder.php 26 Oct 2002 09:03:38 -0000 1.9
***************
*** 56,69 ****
{
- /* if ($choose || $copy_order)
- {
- $num = create_wrkorderid($year);
- }
- else
- {
- $num = addslashes($num);
- }
- */
-
$errorcount = 0;
--- 56,59 ----
***************
*** 312,316 ****
$next_id=$num+1;
! $GLOBALS['phpgw']->db->query("update phpgw_config set
config_value='$next_id' where config_name='fmwrkorder_id'");
//------------------Integration with FacilityCenter
--- 302,309 ----
$next_id=$num+1;
!
! increment_wrkorderid($next_id);
!
! // $GLOBALS['phpgw']->db->query("update phpgw_config set
config_value='$next_id' where config_name='fmwrkorder_id'");
//------------------Integration with FacilityCenter
Index: edit_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_workorder.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** edit_workorder.php 2 Oct 2002 17:00:00 -0000 1.7
--- edit_workorder.php 26 Oct 2002 09:03:38 -0000 1.8
***************
*** 360,364 ****
$next_id=$num+1;
! $GLOBALS['phpgw']->db->query("update phpgw_config set
config_value='$next_id' where config_name='fmwrkorder_id'");
//------------------Integration with FacilityCenter
--- 360,366 ----
$next_id=$num+1;
! increment_wrkorderid($next_id);
!
! // $GLOBALS['phpgw']->db->query("update phpgw_config set
config_value='$next_id' where config_name='fmwrkorder_id'");
//------------------Integration with FacilityCenter
Index: invoice_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_paid.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** invoice_paid.php 16 Sep 2002 16:05:44 -0000 1.6
--- invoice_paid.php 26 Oct 2002 09:03:38 -0000 1.7
***************
*** 762,766 ****
'no_of_days' => $no_of_days,
'period' => $period,
! 'belop' => $belop,
'godkjentbelop' =>
$godkjentbelop,
'underbilag' => $underbilag,
--- 762,766 ----
'no_of_days' => $no_of_days,
'period' => $period,
! 'belop' =>
sprintf("%01.2f",$belop),
'godkjentbelop' =>
$godkjentbelop,
'underbilag' => $underbilag,
Index: edit_project.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_project.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** edit_project.php 24 Sep 2002 15:44:47 -0000 1.3
--- edit_project.php 26 Oct 2002 09:03:38 -0000 1.4
***************
*** 69,77 ****
if ($submit)
{
- $errorcount = 0;
-
if ($copy_order)
{
! $num = create_wrkorderid($year);
}
if (!$num)
--- 69,75 ----
if ($submit)
{
if ($copy_order)
{
! $num = create_project_id();
}
if (!$num)
***************
*** 80,83 ****
--- 78,114 ----
}
+ $errorcount = 0;
+
+ if ($need_approval)
+ {
+
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
+
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
+ $headers = "Return-Path: <". $coordinator_email
.">\r\n";
+ $headers .= "From: " . $coordinator_name . "<" .
$coordinator_email .">\r\n";
+ $headers .= "Bcc: " . $coordinator_name . "<" .
$coordinator_email .">\r\n";
+ $headers .= "Content-type: text/plain;
charset=iso-8859-1\r\n";
+
+ $subject = lang(Approval).": ".$num;
+ $message = lang(Project) . " " .$num ." ".
lang(needs_approval);
+
+ $mail_method= $config->config_data['fmwrkorder_mail'];
+ if ($mail_method=='smtp'):
+ {
+ $bcc = $coordinator_email;
+ $send = CreateObject('phpgwapi.send');
+ $rcpt = $send->msg('email',
$to_approval_from_email, $subject, stripslashes($message), '', $cc, $bcc,
$coordinator_email, $coordinator_name, 'plain');
+ }
+ elseif ($mail_method=='sendmail'):
+ {
+
$rcpt=mail($to_approval_from_email,$subject,$message, $headers);
+ }
+ else:
+ {
+ $error[$errorcount++] = lang('Mailing method is
not chosen! ("admin" section)');
+ }
+ endif;
+ }
+
+
$GLOBALS['phpgw']->db->query("select count(*) from
fm_wo_project where num='$num'");
$GLOBALS['phpgw']->db->next_record();
***************
*** 214,218 ****
//---------------------------copy_order--------------------
{
- $num=next_id(fm_wo_project);
$owner = $GLOBALS['phpgw_info']['user']['account_id'];
$descr = addslashes($descr);
--- 245,248 ----
***************
*** 235,241 ****
}
- $next_id=$num+1;
-
- // $GLOBALS['phpgw']->db->query("update phpgw_config set
config_value='$next_id' where config_name='fmproject_id'");
// -----------------which branch is represented
--- 265,268 ----
***************
*** 274,277 ****
--- 301,335 ----
}
+ $GLOBALS['phpgw']->db->query("select budget, id as wrkorder_id from
fm_wo_wrkorders where project_id='$id'");
+ while ($GLOBALS['phpgw']->db->next_record())
+ {
+ $sum_calculation=
$sum_calculation+$GLOBALS['phpgw']->db->f('budget');
+ $wrkorder .= '</tr>';
+ $wrkorder .= '<tr>';
+ $wrkorder .= '<td>' .
$GLOBALS['phpgw']->db->f('wrkorder_id') . '</td>';
+ $wrkorder .= '<td>' .
sprintf("%01.2f",$GLOBALS['phpgw']->db->f('budget')) . '</td>';
+ $wrkorder .= '</tr>';
+
+ }
+ $t->set_var('wrkorder',$wrkorder);
+
+ if ($wrkorder)
+ {
+ $wrkorder_header = '<tr>';
+ $wrkorder_header .= '<td>' . lang('workorder') .
'</td>';
+ }
+ else
+ {
+ $wrkorder_header = '';
+ }
+
+ $t->set_var('wrkorder_header',$wrkorder_header);
+
+
+ //$sum_calculation = $GLOBALS['phpgw']->db->f('sum_calculation');
+ $t->set_var('sum_calculation',sprintf("%01.2f",$sum_calculation));
+
+ $t->set_var('lang_sum_calculation',lang('Sum Calculation'));
+
$GLOBALS['phpgw']->db->query("select * from fm_wo_project where
id='$id'");
$GLOBALS['phpgw']->db->next_record();
***************
*** 323,329 ****
$t->set_var('account_id',$account_id);
! $t->set_var('lang_need_approval','');
! $t->set_var('need_approval','');
! $t->set_var('to_approval_from_email','');
$charge_tenant =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('charge_tenant'));
--- 381,413 ----
$t->set_var('account_id',$account_id);
!
$approval_from_id=$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_approval_from'];
! $workorder_approval = $config->config_data['workorder_approval'];
!
! if ($approval_from_id && ($workorder_approval=='yes'))
! {
! $t->set_var('lang_need_approval',lang('Need Approval:'));
! $approval_from_lid=
$GLOBALS['phpgw']->accounts->id2name($approval_from_id);
!
! $prefs =
$GLOBALS['phpgw']->preferences->create_email_preferences($approval_from_id);
! $to_approval_from_email = $prefs['email']['address'];
! $field_size= strlen($to_approval_from_email)+3;
! $t->set_var('to_approval_from_email','<input type="text"
size="'. $field_size .'" name="coordinator_email" value="'
.$to_approval_from_email .'">');
!
! // echo 'to: '.$to_approval_from_email .'<BR>';
!
! if ($need_approval)
! {
! $checked_need_approval='checked';
! }
!
! $t->set_var('need_approval','<input type="checkbox"
name="need_approval" ' .$checked_need_approval .'>');
! }
! else
! {
! $t->set_var('need_approval','');
! $t->set_var('to_approval_from_email','');
! $t->set_var('lang_need_approval','');
! }
!
$charge_tenant =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('charge_tenant'));
Index: add_project.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_project.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** add_project.php 19 Sep 2002 18:42:37 -0000 1.2
--- add_project.php 26 Oct 2002 09:03:38 -0000 1.3
***************
*** 55,59 ****
if ($choose || $copy_order)
{
! $num = next_id(fm_wo_project);
}
else
--- 55,60 ----
if ($choose || $copy_order)
{
! // $num = next_id(fm_wo_project);
! $num = create_project_id();
}
else
***************
*** 245,251 ****
$GLOBALS['phpgw']->db->query("update
$el_meter_table set el_meter_id='$el_meter_id' where $el_meter_condition");
}
-
- $next_id=$num+1;
- // $GLOBALS['phpgw']->db->query("update phpgw_config set
config_value='$next_id' where config_name='fmwrkorder_id'");
$p_id = $num;
--- 246,249 ----
Index: invoice_consume.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_consume.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** invoice_consume.php 3 Sep 2002 22:15:38 -0000 1.2
--- invoice_consume.php 26 Oct 2002 09:03:38 -0000 1.3
***************
*** 341,345 ****
// ------------------- template declaration for list records
-------------------------
$t->set_var(array('district' => $district,
! 'consume' => $consume,
'period' => $period,
'b_account_class' =>
$b_account_class,
--- 341,345 ----
// ------------------- template declaration for list records
-------------------------
$t->set_var(array('district' => $district,
! 'consume' =>
sprintf("%01.2f",$consume),
'period' => $period,
'b_account_class' =>
$b_account_class,
Index: id_controle.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/id_controle.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** id_controle.php 23 Oct 2002 20:02:19 -0000 1.1
--- id_controle.php 26 Oct 2002 09:03:38 -0000 1.2
***************
*** 40,56 ****
! if ($submit and $value)
{
! while($entry=each($value))
! {
! $n=$entry[0];
! $GLOBALS['phpgw']->db->query("update
IDGenerator set value='$value[$n]' where Name='$descr_h[$n]' ");
! }
!
! $t->set_var('message',lang('Values are updated !'));
}
--- 40,58 ----
! if ($submit)
{
+ if ($select)
+ {
+ while($entry=each($select))
+ {
+ $n=$entry[0];
!
$GLOBALS['phpgw']->db->query("update IDGenerator set value='$value[$n]' where
Name='$descr_h[$n]' ");
! }
! $t->set_var('message',lang('Values are updated !'));
! }
}
***************
*** 116,119 ****
--- 118,123 ----
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+
+ $select = '<input type="checkbox" name="select[' . $j . ']"
value="'. $j . '">';
$descr =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('Name'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property add_workorder.php,1.8,1.9 edit_workorder.php,1.7,1.8 invoice_paid.php,1.6,1.7 edit_project.php,1.3,1.4 add_project.php,1.2,1.3 invoice_consume.php,1.2,1.3 id_controle.php,1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc functions.inc.php,1.7,1.8 class.soXport.inc.php,1.2,1.3 class.uiXport.inc.php,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: admin index.php,1.28,1.29
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc functions.inc.php,1.7,1.8 class.soXport.inc.php,1.2,1.3 class.uiXport.inc.php,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: admin index.php,1.28,1.29
- Index(es):