projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from stable branch up to 2.3.12
[fa-stable.git]
/
purchasing
/
po_entry_items.php
diff --git
a/purchasing/po_entry_items.php
b/purchasing/po_entry_items.php
index 53bf85e35d79372f9da723733ddd970a706528ef..961bb5b3a85ac2440d8c027c2e3ca411d733f026 100644
(file)
--- a/
purchasing/po_entry_items.php
+++ b/
purchasing/po_entry_items.php
@@
-23,8
+23,11
@@
set_page_security( @$_SESSION['PO']->trans_type,
ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
array( 'NewOrder' => 'SA_PURCHASEORDER',
'ModifyOrderNumber' => 'SA_PURCHASEORDER',
ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
array( 'NewOrder' => 'SA_PURCHASEORDER',
'ModifyOrderNumber' => 'SA_PURCHASEORDER',
+ 'AddedID' => 'SA_PURCHASEORDER',
'NewGRN' => 'SA_GRN',
'NewGRN' => 'SA_GRN',
- 'NewInvoice' => 'SA_SUPPLIERINVOICE')
+ 'AddedGRN' => 'SA_GRN',
+ 'NewInvoice' => 'SA_SUPPLIERINVOICE',
+ 'AddedPI' => 'SA_SUPPLIERINVOICE')
);
$js = '';
);
$js = '';
@@
-58,7
+61,7
@@
if (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber']))
page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['ModifyOrderNumber']))
page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['ModifyOrderNumber']))
- check_is_
closed
(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
+ check_is_
editable
(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
//---------------------------------------------------------------------------------------------------
//---------------------------------------------------------------------------------------------------
@@
-393,7
+396,8
@@
function can_commit()
set_focus('StkLocation');
return false;
}
set_focus('StkLocation');
return false;
}
-
+ if (!db_has_currency_rates($_SESSION['PO']->curr_code, $_POST['OrderDate']))
+ return false;
if ($_SESSION['PO']->order_has_items() == false)
{
display_error (_("The order cannot be placed because there are no lines entered on this order."));
if ($_SESSION['PO']->order_has_items() == false)
{
display_error (_("The order cannot be placed because there are no lines entered on this order."));