manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed display problems with invoices

Browse source
This commit is contained in:
Manuel Cillero 2017-09-03 17:12:32 +02:00
parent 977630f995
commit 42355f66e6
4 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/storm/storminvoice/storminvoice.admin.inc
View file

@ -38,15 +38,7 @@ function storminvoice_list() {
'nowrap' => 'nowrap',
),
array(
'data' => t('Organization'),
'field' => 'sin.organization_title',
),
array(
'data' => t('Project'),
'field' => 'sin.project_title',
),
array(
'data' => t('Description'),
'data' => t('Description') . ' / ' . t('Organization') . ' » ' . t('Project'),
'field' => 'n.title',
),
array(

6
modules/storm/storminvoice/storminvoice.module
View file

@ -76,7 +76,7 @@ function storminvoice_menu() {
$items['invoice/auto_add/new/%node'] = array(
'page callback' => 'storminvoice_auto_add',
'page arguments' => array(4),
'page arguments' => array(3),
'access arguments' => array('Storm invoice: add'),
'type' => MENU_CALLBACK,
'file' => 'storminvoice.auto_add.inc',
@ -92,7 +92,7 @@ function storminvoice_menu() {
$items['invoice/report/%node/%/%'] = array(
'title' => 'Invoice',
'page arguments' => array(3, 4, 5),
'page arguments' => array(2, 3, 4),
'description' => 'SuiteDesk Invoice',
'page callback' => 'storminvoice_report',
'access arguments' => array('Storm invoice: access'),
@ -102,7 +102,7 @@ function storminvoice_menu() {
$items['invoice/report/%node/email/%'] = array(
'title' => 'Send Invoice by Email',
'page arguments' => array(3, 5),
'page arguments' => array(2, 4),
'description' => 'SuiteDesk Invoice',
'page callback' => 'storminvoice_send_page',
'access arguments' => array('Storm invoice: access'),

25
modules/storm/storminvoice/storminvoice.theme.inc
View file

@ -34,19 +34,22 @@ function theme_storminvoice_list($header, $invoices, $itemsperpage, $totals_topa
$invoice->status = 'overdue';
}
$requestdate = format_date($invoice->requestdate, 'small');
$requestdate = substr($requestdate, 0, strpos($requestdate, ' '));
$rows[] = array(
array(
'data' => storm_icon('invoice_status_'. check_plain($invoice->status), storm_attribute_value('Invoice status', $invoice->status)),
'style' => 'text-align: center',
),
array(
'data' => l($invoice->number, 'node/'. $invoice->nid),
'data' => '<span class="invoice-number">' . l($invoice->number, 'node/'. $invoice->nid) . '</span>',
'style' => 'text-align: right',
),
l($invoice->organization_title, 'node/'. $invoice->organization_nid),
l($invoice->project_title, 'node/'. $invoice->project_nid),
l($invoice->title, 'node/'. $invoice->nid),
format_date($invoice->requestdate, 'custom', 'Y-m-d'),
'<span class="invoice-title">' . l($invoice->title, 'node/'. $invoice->nid) . theme('mark', node_mark($invoice->nid, $invoice->changed)) . '</span><br />' .
l($invoice->organization_title, 'node/'. $invoice->organization_nid) .' » '.
l($invoice->project_title, 'node/'. $invoice->project_nid),
$requestdate,
array('data' => sprintf('%.2f', $invoice->total), 'align' => 'right'),
array(
'data' => storm_icon_edit_node($invoice, $_GET) .'&nbsp;'. storm_icon_delete_node($invoice, $_GET),
@ -55,7 +58,7 @@ function theme_storminvoice_list($header, $invoices, $itemsperpage, $totals_topa
);
}
$o = theme('table', $header, $rows);
$o = theme('table', $header, $rows, array('id' => 'storminvoices'));
$o .= theme('pager', NULL, $itemsperpage, 0);
$header = array(
@ -457,16 +460,6 @@ function theme_storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
);
}
if ($node->content['body']['#value']) {
$node->content['body_field'] = array(
'#prefix' => '<div class="stormbody">',
'#suffix' => '</div>',
'#value' => theme('storm_view_item', t('Description'), $node->content['body']['#value']),
'#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'body_field') : -18,
);
unset($node->content['body']);
}
return $node;
}

1
modules/storm/stormorganization/stormorganization.module
View file

@ -192,6 +192,7 @@ function stormorganization_node_info() {
'module' => 'stormorganization',
'description' => t("An organization for SuiteDesk."),
'title_label' => t("Name"),
'has_body' => FALSE,
)
);
}