Skip to content

I
intranet-invoices
Commit 4880bbe0 authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Localization and fix bugs

parent 60e98dcc
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 19 deletions
www/invoice-association-action-2-oracle.xql 0 → 100644
View file @ 4880bbe0
<?xml version="1.0"?>
<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "/usr/share/emacs/DTDs/xql.dtd">
<!-- packages/intranet-invoices/www/invoice-association-action-2-oracle.xql -->
<!-- @author Juanjo Ruiz (juanjoruizx@yahoo.es) -->
<!-- @creation-date 2004-10-07 -->
<!-- @arch-tag 48a3aa6c-6b19-4397-97c8-2290ed48cf4a -->
<!-- @cvs-id $Id$ -->
<queryset>
<rdbms>
<type>oracle</type>
<version>8.1.6</version>
</rdbms>
<fullquery name="insert_association">
<querytext>
begin
:1 := acs_rel.new(
object_id_one => :object_id,
object_id_two => :invoice_id
);
end;
</querytext>
</fullquery>
</queryset>
www/invoice-association-action-2-postgresql.xql 0 → 100644
View file @ 4880bbe0
<?xml version="1.0"?>
<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "/usr/share/emacs/DTDs/xql.dtd">
<!-- packages/intranet-invoices/www/invoice-association-action-2-postgresql.xql -->
<!-- @author Juanjo Ruiz (juanjoruizx@yahoo.es) -->
<!-- @creation-date 2004-10-07 -->
<!-- @arch-tag e5082d5b-edcf-4b26-a9e6-4c729ef96982 -->
<!-- @cvs-id $Id$ -->
<queryset>
<rdbms>
<type>postgresql</type>
<version>7.2</version>
</rdbms>
<fullquery name="insert_association">
<querytext>
select acs_rel__new (
null,
'relationship',
:object_id,
:invoice_id,
null,
null,
null
)
</querytext>
</fullquery>
</queryset>
www/invoice-association-action-2.tcl
View file @ 4880bbe0
......@@ -29,17 +29,7 @@ if {![im_permission $user_id add_invoices]} {
# ---------------------------------------------------------------
# Update association
# ---------------------------------------------------------------
db_dml insert_association "
DECLARE
v_rel_id integer;
BEGIN
v_rel_id := acs_rel.new(
object_id_one => :object_id,
object_id_two => :invoice_id
);
END;
"
set association_id [db_exec_plsql insert_association {} ]
db_release_unused_handles
ad_returnredirect $return_url
www/invoice-association-action.tcl
View file @ 4880bbe0
......@@ -84,13 +84,12 @@ select
ci.*,
c.*,
o.*,
ci.effective_date + ci.payment_days as calculated_due_date,
to_date(to_char(ci.effective_date,'yyyymmdd'),'yyyymmdd') + ci.payment_days as calculated_due_date,
pm_cat.category as invoice_payment_method,
pm_cat.category_description as invoice_payment_method_desc,
im_name_from_user_id(c.accounting_contact_id) as company_contact_name,
im_email_from_user_id(c.accounting_contact_id) as company_contact_email,
c.company_name,
cc.country_name,
im_category_from_id(ci.cost_status_id) as cost_status,
im_category_from_id(ci.cost_type_id) as cost_type,
im_category_from_id(ci.template_id) as template
......@@ -99,15 +98,13 @@ from
im_costs ci,
im_companies c,
im_offices o,
country_codes cc,
im_categories pm_cat
where
i.invoice_id = :invoice_id
and i.invoice_id = ci.cost_id
and i.payment_method_id = pm_cat.category_id(+)
and ci.company_id = c.company_id(+)
and c.main_office_id=o.office_id(+)
and o.address_country_code=cc.iso(+)
and i.payment_method_id = pm_cat.category_id
and ci.customer_id = c.company_id
and c.main_office_id=o.office_id
"
if { ![db_0or1row projects_info_query $query] } {
......@@ -115,6 +112,11 @@ if { ![db_0or1row projects_info_query $query] } {
return
}
if { ![db_0or1row "get country_name" "select cc.country_name \
from country_codes cc \
where cc.iso = :address_country_code"]} {
set country_name ""
}
set project_select [im_project_select object_id $project_id "" "" "" "" $company_id]
......
www/notify-oracle.xql 0 → 100644
View file @ 4880bbe0
<?xml version="1.0"?>
<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "/usr/share/emacs/DTDs/xql.dtd">
<!-- packages/intranet-invoices/www/notify-oracle.xql -->
<!-- @author Juanjo Ruiz (juanjoruizx@yahoo.es) -->
<!-- @creation-date 2004-10-07 -->
<!-- @arch-tag 5a4d66ad-c18d-46bf-b150-8ff2c1fbb877 -->
<!-- @cvs-id $Id$ -->
<queryset>
<rdbms>
<type>oracle</type>
<version>8.1.6</version>
</rdbms>
<fullquery name="project_name">
<querytext>
select acs_object.name(:invoice_id) from dual
</querytext>
</fullquery>
</queryset>
www/notify-postgresql.xql 0 → 100644
View file @ 4880bbe0
<?xml version="1.0"?>
<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "/usr/share/emacs/DTDs/xql.dtd">
<!-- packages/intranet-invoices/www/notify-postgresql.xql -->
<!-- @author Juanjo Ruiz (juanjoruizx@yahoo.es) -->
<!-- @creation-date 2004-10-07 -->
<!-- @arch-tag 16a384f6-aa92-4668-9f42-51b4e1085bc8 -->
<!-- @cvs-id $Id$ -->
<queryset>
<rdbms>
<type>postgresql</type>
<version>7.2</version>
</rdbms>
<fullquery name="project_name">
<querytext>
select acs_object__name(:invoice_id) from dual
</querytext>
</fullquery>
</queryset>
www/notify.tcl
View file @ 4880bbe0
......@@ -36,7 +36,7 @@ if {![im_permission $user_id view_invoices]} {
# --------------------------------------------------------
set system_name [ad_system_name]
set object_name [db_string project_name "select acs_object.name(:invoice_id) from dual"]
set object_name [db_string project_name ""]
set page_title "[_ intranet-invoices.Notify_user]"
set context [list $page_title]
set current_user_name [db_string cur_user "select im_name_from_user_id(:user_id) from dual"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment