projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0000987: In Supplier Payments allocation list should display Supplier Reference if...
[fa-stable.git]
/
reporting
/
reports_main.php
diff --git
a/reporting/reports_main.php
b/reporting/reports_main.php
index 718484a03b34e911c451d346e065485d78e80bb3..ca27855618aaf47e3298a5fa06d0624075d365f1 100644
(file)
--- a/
reporting/reports_main.php
+++ b/
reporting/reports_main.php
@@
-42,6
+42,7
@@
$reports->addReport(RC_CUSTOMER, 102, _('&Aged Customer Analysis'),
array( _('End Date') => 'DATE',
_('Customer') => 'CUSTOMERS_NO_FILTER',
_('Currency Filter') => 'CURRENCY',
array( _('End Date') => 'DATE',
_('Customer') => 'CUSTOMERS_NO_FILTER',
_('Currency Filter') => 'CURRENCY',
+ _('Show Also Allocated') => 'YES_NO',
_('Summary Only') => 'YES_NO',
_('Suppress Zeros') => 'YES_NO',
_('Graphics') => 'GRAPHIC',
_('Summary Only') => 'YES_NO',
_('Suppress Zeros') => 'YES_NO',
_('Graphics') => 'GRAPHIC',
@@
-55,6
+56,12
@@
$reports->addReport(RC_CUSTOMER, 103, _('Customer &Detail Listing'),
_('Activity Less Than') => 'TEXT',
_('Comments') => 'TEXTBOX',
_('Destination') => 'DESTINATION'));
_('Activity Less Than') => 'TEXT',
_('Comments') => 'TEXTBOX',
_('Destination') => 'DESTINATION'));
+$reports->addReport(RC_CUSTOMER, 114, _('Sales &Summary Report'),
+ array( _('Start Date') => 'DATEBEGINTAX',
+ _('End Date') => 'DATEENDTAX',
+ _('Tax Id Only') => 'YES_NO',
+ _('Comments') => 'TEXTBOX',
+ _('Destination') => 'DESTINATION'));
$reports->addReport(RC_CUSTOMER, 104, _('&Price Listing'),
array( _('Currency Filter') => 'CURRENCY',
_('Inventory Category') => 'CATEGORIES',
$reports->addReport(RC_CUSTOMER, 104, _('&Price Listing'),
array( _('Currency Filter') => 'CURRENCY',
_('Inventory Category') => 'CATEGORIES',
@@
-77,13
+84,20
@@
$reports->addReport(RC_CUSTOMER, 106, _('&Salesman Listing'),
_('Summary Only') => 'YES_NO',
_('Comments') => 'TEXTBOX',
_('Destination') => 'DESTINATION'));
_('Summary Only') => 'YES_NO',
_('Comments') => 'TEXTBOX',
_('Destination') => 'DESTINATION'));
-$reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices
/Credit Notes
'),
+$reports->addReport(RC_CUSTOMER, 107, _('Print &Invoices'),
array( _('From') => 'INVOICE',
_('To') => 'INVOICE',
_('Currency Filter') => 'CURRENCY',
_('email Customers') => 'YES_NO',
_('Payment Link') => 'PAYMENT_LINK',
_('Comments') => 'TEXTBOX'));
array( _('From') => 'INVOICE',
_('To') => 'INVOICE',
_('Currency Filter') => 'CURRENCY',
_('email Customers') => 'YES_NO',
_('Payment Link') => 'PAYMENT_LINK',
_('Comments') => 'TEXTBOX'));
+$reports->addReport(RC_CUSTOMER, 113, _('Print &Credit Notes'),
+ array( _('From') => 'CREDIT',
+ _('To') => 'CREDIT',
+ _('Currency Filter') => 'CURRENCY',
+ _('email Customers') => 'YES_NO',
+ _('Payment Link') => 'PAYMENT_LINK',
+ _('Comments') => 'TEXTBOX'));
$reports->addReport(RC_CUSTOMER, 110, _('Print &Deliveries'),
array( _('From') => 'DELIVERY',
_('To') => 'DELIVERY',
$reports->addReport(RC_CUSTOMER, 110, _('Print &Deliveries'),
array( _('From') => 'DELIVERY',
_('To') => 'DELIVERY',
@@
-93,7
+107,7
@@
$reports->addReport(RC_CUSTOMER, 110, _('Print &Deliveries'),
$reports->addReport(RC_CUSTOMER, 108, _('Print &Statements'),
array( _('Customer') => 'CUSTOMERS_NO_FILTER',
_('Currency Filter') => 'CURRENCY',
$reports->addReport(RC_CUSTOMER, 108, _('Print &Statements'),
array( _('Customer') => 'CUSTOMERS_NO_FILTER',
_('Currency Filter') => 'CURRENCY',
- _('Show
Outstanding Only
') => 'YES_NO',
+ _('Show
Also Allocated
') => 'YES_NO',
_('Email Customers') => 'YES_NO',
_('Comments') => 'TEXTBOX'));
$reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),
_('Email Customers') => 'YES_NO',
_('Comments') => 'TEXTBOX'));
$reports->addReport(RC_CUSTOMER, 109, _('&Print Sales Orders'),
@@
-109,12
+123,6
@@
$reports->addReport(RC_CUSTOMER, 111, _('&Print Sales Quotations'),
_('Currency Filter') => 'CURRENCY',
_('Email Customers') => 'YES_NO',
_('Comments') => 'TEXTBOX'));
_('Currency Filter') => 'CURRENCY',
_('Email Customers') => 'YES_NO',
_('Comments') => 'TEXTBOX'));
-$reports->addReport(RC_CUSTOMER, 111, _('&Print Sales Quotations'),
- array( _('From') => 'QUOTATIONS',
- _('To') => 'QUOTATIONS',
- _('Currency Filter') => 'CURRENCY',
- _('Email Customers') => 'YES_NO',
- _('Comments') => 'TEXTBOX'));
$reports->addReport(RC_CUSTOMER, 112, _('Print Receipts'),
array( _('From') => 'RECEIPT',
_('To') => 'RECEIPT',
$reports->addReport(RC_CUSTOMER, 112, _('Print Receipts'),
array( _('From') => 'RECEIPT',
_('To') => 'RECEIPT',
@@
-134,6
+142,7
@@
$reports->addReport(RC_SUPPLIER, 202, _('&Aged Supplier Analyses'),
array( _('End Date') => 'DATE',
_('Supplier') => 'SUPPLIERS_NO_FILTER',
_('Currency Filter') => 'CURRENCY',
array( _('End Date') => 'DATE',
_('Supplier') => 'SUPPLIERS_NO_FILTER',
_('Currency Filter') => 'CURRENCY',
+ _('Show Also Allocated') => 'YES_NO',
_('Summary Only') => 'YES_NO',
_('Suppress Zeros') => 'YES_NO',
_('Graphics') => 'GRAPHIC',
_('Summary Only') => 'YES_NO',
_('Suppress Zeros') => 'YES_NO',
_('Graphics') => 'GRAPHIC',
@@
-166,7
+175,8
@@
$reports->addReport(RC_SUPPLIER, 210, _('Print Remittances'),
$reports->addReportClass(_('Inventory'), RC_INVENTORY);
$reports->addReport(RC_INVENTORY, 301, _('Inventory &Valuation Report'),
$reports->addReportClass(_('Inventory'), RC_INVENTORY);
$reports->addReport(RC_INVENTORY, 301, _('Inventory &Valuation Report'),
- array( _('Inventory Category') => 'CATEGORIES',
+ array( _('End Date') => 'DATE',
+ _('Inventory Category') => 'CATEGORIES',
_('Location') => 'LOCATIONS',
_('Summary Only') => 'YES_NO',
_('Comments') => 'TEXTBOX',
_('Location') => 'LOCATIONS',
_('Summary Only') => 'YES_NO',
_('Comments') => 'TEXTBOX',