addedit: fix changing status of invoices.

addedit.php

@@ -330,7 +330,8 @@ function searchIt() {
 
 function changeStat() {
         var f=document.frmStatus;
-        f.submit();
+	f.stat.value = f.status.value;
+//        f.submit();
 }
 
 var calendarField = '';
@@ -375,7 +376,7 @@ function checkUncheckAll(theElement) {
 </form>
 
 <table cellspacing="0" cellpadding="4" border="0" width="40%" class="std" valign="top">
-<form name="statusFrm" action="./index.php?m=invoice" method="post">
+<form name="frmStatus" action="./index.php?m=invoice" method="post">
         <input type="hidden" name="dosql" value="do_invoice_aed" />
 	<input type="hidden" name="del" value="0" />
         <input type="hidden" name="invoice_project" value="<?php echo $project_id;?>" />
@@ -394,7 +395,7 @@ Invoices will not be editable once the status changes from Open for Editing.
 </tr>
 <tr valign="top" width="90%">
 <td align="right">Invoice Tag</td>;
-<td align="right"><input type="text" name="tag" value="<?php echo $invoice_tag;?>" class="text" pattern="^\s*\d{8}" size=8 /></td>
+<td align="right"><input type="text" name="tag" value="<?php echo $invoice_tag;?>" class="text" pattern="^\s*\d{6}" size=8 /></td>
 <td>&nbsp;</td>
 </tr>
 <tr valign="top" width="90%">
@@ -411,10 +412,10 @@ Invoices will not be editable once the status changes from Open for Editing.
 </tr>
 <tr>
 <td align="left">
-<input class="button" type="button" name="cancel" value="<?php echo $AppUI->_('cancel');?>" onClick="javascript:if(confirm('Are you sure you want to cancel.')){location.href = './index.php?m=invoice';}" />
+<input class="button" type="button" name="cancel" value="<?php echo w2PformSafe('cancel');?>" onClick="javascript:if(confirm('Are you sure you want to cancel.')){location.href = './index.php?m=invoice';}" />
 </td>
 <td align="right">
-<input class="button" type="submit" name="submit" value="<?php echo $AppUI->_('submit');?>"/>
+<input class="button" type="submit" name="submit" value="<?php echo w2PformSafe('submit');?>"/>
 </td>
 </tr>
 </form>
@@ -463,6 +464,7 @@ for ($s=0; $s < count($tasks); $s++) {
 </tr>
 </table>
 
+<!-- // Form to add task_log_id to invoice -->
 <table cellspacing="0" cellpadding="4" border="0" width="70%" class="std">
 <tr valign="top" width="90%">
 
@@ -546,4 +548,3 @@ if (isset($_POST['start_date']))
 </form>
 </table>
 
-<?php echo $AppUI->_('requiredField');?>

do_invoice_aed.php

@@ -4,7 +4,7 @@ if (!defined('W2P_BASE_DIR')) {
 }
 
 $del = w2PgetParam($_POST, 'del', 0);
-$stat = w2PgetParam($_POST,'stat' -1);
+$stat = w2PgetParam($_POST,'stat', -1);
 $tag = w2PgetParam($_POST, 'tag', -1);
 
 $obj = new CInvoice();
@@ -27,12 +27,14 @@ if ($del) {
 	if (!$obj->change_status($stat)) {
 		$AppUI->setMsg( 'Invoice status change failed', UI_MSG_ERROR );
 	} else {
-		$AppUI->setMsg( "Invoice updated", UI_MSG_ALERT );
+		$AppUI->setMsg( "Invoice status updated", UI_MSG_ALERT );
 	}
+	$msg = "m=invoice&a=addedit&invoice_id=".$obj->task_invoice."&project_id=".$obj->invoice_project;
+} else if ($tag != '' && $obj->task_invoice != 0) {
 	if (!$obj->change_invoice_tag($tag)) {
 		$AppUI->setMsg( "Invoice tag change failed", UI_MSG_ERROR );
 	} else {
-		$AppUI->setMsg( "Invoice tag updated", UI_MSG_ALERT );
+		$AppUI->setMsg( "Invoice tag updated ". $tag, UI_MSG_ALERT );
 	}
 	$msg = "m=invoice&a=addedit&invoice_id=".$obj->task_invoice."&project_id=".$obj->invoice_project;
 } else {