Skip to content

I
intranet-timesheet2-invoices
Commit a11cb4b4 authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- joined v3.1.4 with head

parent c7200ce7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 892 additions and 900 deletions
catalog/intranet-timesheet2-invoices.de_DE.ISO-8859-1.xml
View file @ a11cb4b4
<?xml version="1.0" encoding="ISO-8859-1"?>
<message_catalog package_key="intranet-timesheet2-invoices" package_version="3.0.0.0.4" locale="de_DE" charset="ISO-8859-1">
<msg key="Accounting_Contact">Rechnungskontakt</msg>
<msg key="Add_New">Neuer Eintrag</msg>
<msg key="Adress">Addresse</msg>
<msg key="Amount">Betrag</msg>
<msg key="Billable_Units">Abrechenbare Einheiten</msg>
<msg key="Client">Kunde</msg>
<msg key="Company">Firma</msg>
<msg key="Company_name">Firmenname</msg>
<msg key="Country">Land</msg>
<msg key="Create_Invoice">Neue Rechnung</msg>
<msg key="Currency">Whrung</msg>
<msg key="Del">Lsch</msg>
<msg key="Delivery_Date">Lieferdatum</msg>
<msg key="Description">Beschreibung</msg>
<msg key="Email">E-Mail</msg>
<msg key="Fax">Fax</msg>
<msg key="Filter_Projects">Projekte filtern</msg>
<msg key="Invoice_Currency">Rechnungswhrung</msg>
<msg key="Invoice_Data">Rechnungsdaten</msg>
<msg key="Invoice_date">Rechnungsdatum</msg>
<msg key="Invoice_nr">Rechnungsnr.</msg>
<msg key="Invoice_template">Rechnungsvorlage</msg>
<msg key="Invoices">Rechnungen und Angebote</msg>
<msg key="lt_Check_this_sample_pra">Probieren sie diese %sample_pracelist_link%. </msg>
<msg key="lt_Create_Purchase_Order">Neuer Auftrag</msg>
<msg key="lt_for_this_company_via_">fr diese Firma durch eine CSV-Datei</msg>
<msg key="lt_Generate_Purchase_Ord">Auftrag erstellen</msg>
<msg key="lt_It_contains_some_comm">Kommentare sind in der Datei enthalten.</msg>
<msg key="lt_sample_pricelist_CSV_">Beispiel Preisliste in CSV-Format</msg>
<msg key="lt_Select_Projects_for_I">Projekte auswhlen</msg>
<msg key="lt_Select_Tasks_for_Invo">Aufgaben auswhlen</msg>
<msg key="lt_To_create_a_new_invoi">Bitte whlen sie ein oder mehr Projekte&lt;br&gt;&lt;em&gt;des selben Kunden&lt;/em&gt; und besttigen sie</msg>
<msg key="New_Invoice">Neue Rechnung</msg>
<msg key="New_Price">Neuer Preis</msg>
<msg key="New_Purchase_Order">Neuer Auftrag</msg>
<msg key="No_prices_found">Keine Preise gefunden</msg>
<msg key="No_tasks_found">Keine Aufgaben gefunden</msg>
<msg key="One_project">Ein Projekt</msg>
<msg key="Order">Zeilennr.</msg>
<msg key="Payment_Method">Zahlungsmethode</msg>
<msg key="Payment_terms">Zahlungsbedingungen</msg>
<msg key="Phone">Telefon</msg>
<msg key="Price">Preis</msg>
<msg key="Price_List">Preisliste</msg>
<msg key="Project_">Projekt</msg>
<msg key="Project_Name">Projektname</msg>
<msg key="Project_Status">Projektstatus</msg>
<msg key="Project_Type">Projekttyp</msg>
<msg key="Projects">Projekte</msg>
<msg key="Purchase_Orders">Auftrge</msg>
<msg key="Rate">Rate</msg>
<msg key="Recipient">Empfnger</msg>
<msg key="Reference_Prices">Referenzpreise</msg>
<msg key="Rep">Rep</msg>
<msg key="Sel">Ausw</msg>
<msg key="Source">Quelle</msg>
<msg key="Source_Language">Quellsprache</msg>
<msg key="Src">Quell</msg>
<msg key="Status">Status</msg>
<msg key="Subject">Fachgebiet</msg>
<msg key="Subject_Area">Fachgebiet</msg>
<msg key="Submit">Besttigen</msg>
<msg key="Target">Ziel</msg>
<msg key="Target_Language">Zielsprache</msg>
<msg key="Task_Name">Aufgabenname</msg>
<msg key="Task_Type">Aufgabentyp</msg>
<msg key="TAX">Steuer</msg>
<msg key="Trg">Ziel</msg>
<msg key="Type">Typ</msg>
<msg key="Unit_of_Measure">Einheit</msg>
<msg key="Units">Einheiten</msg>
<msg key="UOM">Einheit</msg>
<msg key="UoM">Einheit</msg>
<msg key="Upload_prices">Preise hochladen</msg>
<msg key="VAT">MwSt. Nr.</msg>
<msg key="XTr">XTr</msg>
<msg key="Zip">PLZ</msg>
</message_catalog>
<?xml version="1.0" encoding="ISO-8859-1"?>
<message_catalog package_key="intranet-timesheet2-invoices" package_version="3.1.1.0.0" locale="de_DE" charset="ISO-8859-1">
<msg key="Accounting_Contact">Rechnungskontakt</msg>
<msg key="Add_New">Neuer Eintrag</msg>
<msg key="Adress">Addresse</msg>
<msg key="Amount">Betrag</msg>
<msg key="Billable_Units">Abrechenbare Einheiten</msg>
<msg key="Client">Kunde</msg>
<msg key="Company">Firma</msg>
<msg key="Company_name">Firmenname</msg>
<msg key="Country">Land</msg>
<msg key="Create_Invoice">Neue Rechnung</msg>
<msg key="Currency">Whrung</msg>
<msg key="Del">Lsch</msg>
<msg key="Delivery_Date">Lieferdatum</msg>
<msg key="Description">Beschreibung</msg>
<msg key="Email">E-Mail</msg>
<msg key="Fax">Fax</msg>
<msg key="Filter_Projects">Projekte filtern</msg>
<msg key="Invoice_Currency">Rechnungswhrung</msg>
<msg key="Invoice_Data">Rechnungsdaten</msg>
<msg key="Invoice_date">Rechnungsdatum</msg>
<msg key="Invoice_nr">Rechnungsnr.</msg>
<msg key="Invoice_template">Rechnungsvorlage</msg>
<msg key="Invoices">Rechnungen und Angebote</msg>
<msg key="lt_Check_this_sample_pra">Probieren sie diese %sample_pracelist_link%. </msg>
<msg key="lt_Create_Purchase_Order">Neuer Auftrag</msg>
<msg key="lt_for_this_company_via_">fr diese Firma durch eine CSV-Datei</msg>
<msg key="lt_Generate_Purchase_Ord">Auftrag erstellen</msg>
<msg key="lt_It_contains_some_comm">Kommentare sind in der Datei enthalten.</msg>
<msg key="lt_sample_pricelist_CSV_">Beispiel Preisliste in CSV-Format</msg>
<msg key="lt_Select_Projects_for_I">Projekte auswhlen</msg>
<msg key="lt_Select_Tasks_for_Invo">Aufgaben auswhlen</msg>
<msg key="lt_To_create_a_new_invoi">Bitte whlen sie ein oder mehr Projekte&lt;br&gt;&lt;em&gt;des selben Kunden&lt;/em&gt; und besttigen sie</msg>
<msg key="New_Invoice">Neue Rechnung</msg>
<msg key="New_Price">Neuer Preis</msg>
<msg key="New_Purchase_Order">Neuer Auftrag</msg>
<msg key="No_prices_found">Keine Preise gefunden</msg>
<msg key="No_tasks_found">Keine Aufgaben gefunden</msg>
<msg key="One_project">Ein Projekt</msg>
<msg key="Order">Zeilennr.</msg>
<msg key="Payment_Method">Zahlungsmethode</msg>
<msg key="Payment_terms">Zahlungsbedingungen</msg>
<msg key="Phone">Telefon</msg>
<msg key="Price">Preis</msg>
<msg key="Price_List">Preisliste</msg>
<msg key="Project_">Projekt</msg>
<msg key="Project_Name">Projektname</msg>
<msg key="Project_Status">Projektstatus</msg>
<msg key="Project_Type">Projekttyp</msg>
<msg key="Projects">Projekte</msg>
<msg key="Purchase_Orders">Auftrge</msg>
<msg key="Rate">Rate</msg>
<msg key="Recipient">Empfnger</msg>
<msg key="Reference_Prices">Referenzpreise</msg>
<msg key="Rep">Rep</msg>
<msg key="Sel">Ausw</msg>
<msg key="Source">Quelle</msg>
<msg key="Source_Language">Quellsprache</msg>
<msg key="Src">Quell</msg>
<msg key="Status">Status</msg>
<msg key="Subject">Fachgebiet</msg>
<msg key="Subject_Area">Fachgebiet</msg>
<msg key="Submit">Besttigen</msg>
<msg key="Target">Ziel</msg>
<msg key="Target_Language">Zielsprache</msg>
<msg key="Task_Name">Aufgabenname</msg>
<msg key="Task_Type">Aufgabentyp</msg>
<msg key="TAX">Steuer</msg>
<msg key="Trg">Ziel</msg>
<msg key="Type">Typ</msg>
<msg key="Unit_of_Measure">Einheit</msg>
<msg key="Units">Einheiten</msg>
<msg key="UOM">Einheit</msg>
<msg key="UoM">Einheit</msg>
<msg key="Upload_prices">Preise hochladen</msg>
<msg key="VAT">MwSt. Nr.</msg>
<msg key="XTr">XTr</msg>
<msg key="Zip">PLZ</msg>
</message_catalog>
catalog/intranet-timesheet2-invoices.es_ES.ISO-8859-1.xml
View file @ a11cb4b4
<?xml version="1.0" encoding="ISO-8859-1"?>
<message_catalog package_key="intranet-timesheet2-invoices" package_version="3.0.0" locale="es_ES" charset="ISO-8859-1">
<message_catalog package_key="intranet-timesheet2-invoices" package_version="3.1.0.0.0" locale="es_ES" charset="ISO-8859-1">
<msg key="Accounting_Contact">Persona de contacto en Contabilidad</msg>
<msg key="Add_New">Aadir nueva</msg>
......@@ -61,12 +61,16 @@
<msg key="lt_You_have_insufficient_1">Carece de privilegios suficientes para utilizar esta pgina.</msg>
<msg key="lt_You_have_selected_mul">Ha seleccionado mltiples clientes.</msg>
<msg key="lt_You_have_selected_mul_1">Ha seleccionado mltiples clientes.</msg>
<msg key="Material">Material</msg>
<msg key="MSM">MSM</msg>
<msg key="Name">Nombre</msg>
<msg key="New_cost_type">Nuevo %cost_type%</msg>
<msg key="New_Customer_Invoice_from_Timesheet_Tasks">Facturar tareas de parte de trabajo</msg>
<msg key="New_Invoice">Nueva factura</msg>
<msg key="New_Price">Nuevo precio</msg>
<msg key="New_Purchase_Order">Nueva orden de compra</msg>
<msg key="New_Quote_from_Timesheet_Tasks">Presupuestar parte de trabajo</msg>
<msg key="New_Timesheet_Invoice">Facturar parte de trabajo</msg>
<msg key="Next_Page">Pgina siguiente</msg>
<msg key="No">No</msg>
<msg key="No_company_found">No se ha encontrado ninguna empresa</msg>
......@@ -78,6 +82,7 @@
<msg key="Payment_Method">Forma de pago</msg>
<msg key="Payment_terms">Condiciones de pago</msg>
<msg key="Phone">Telfono</msg>
<msg key="Planned_Units">Unidades planificadas</msg>
<msg key="Previous_Page">Pgina anterior</msg>
<msg key="Price">Precio</msg>
<msg key="Price_List">Lista de precios</msg>
......@@ -93,6 +98,7 @@
<msg key="Recr_Test">Test de recl.</msg>
<msg key="Reference_Prices">Precios de referencia</msg>
<msg key="Rep">Rep</msg>
<msg key="Reported_Units">Unidades reportadas</msg>
<msg key="Save">Guardar</msg>
<msg key="Sel">Sel</msg>
<msg key="Source">Partida</msg>
......
intranet-timesheet2-invoices.info
View file @ a11cb4b4
......@@ -2,16 +2,16 @@
<!-- Generated by the OpenACS Package Manager -->
<package key="intranet-timesheet2-invoices" url="http://openacs.org/repository/apm/packages/intranet-timesheet2-invoices" type="apm_application">
<package-name>Project/Open Timesheet2 Invoices</package-name>
<pretty-plural>Project/Open Timesheet2 Invoices</pretty-plural>
<package-name>]project-open[ Timesheet2 Invoices</package-name>
<pretty-plural>]project-open[ Timesheet2 Invoices</pretty-plural>
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
<auto-mount>intranet-timesheet2-invoices</auto-mount>
<version name="3.0.0.1.1" url="http://projop.dnsalias.com/download/apm/intranet-timesheet2-invoices-3.0.0.1.1.apm">
<version name="3.1.4.0.0" url="http://projop.dnsalias.com/download/apm/intranet-timesheet2-invoices-3.1.4.0.0.apm">
<owner url="mailto:fraber@fraber.de">Frank Bergmann</owner>
<vendor url="http://www.project-open.com/">Project/Open</vendor>
<vendor url="http://www.project-open.com/">]project-open[</vendor>
<provides url="intranet-timesheet2-invoices" version="3.0.0"/>
<requires url="intranet-core" version="3.0.0"/>
......
sql/common/intranet-timesheet2-invoices-common.sql
View file @ a11cb4b4
-- /packages/intranet-timesheet2-invoices/sql/oracle/intranet-timesheet2-invoices-create.sql
--
-- Copyright (c) 2003-2004 Project/Open
--
-- All rights reserved. Please check
-- http://www.project-open.com/license/ for details.
--
-- @author frank.bergmann@project-open.com
-- Timesheet Invoicing for Project/Open
--
-- Defines:
-- im_trans_prices List of prices with defaults
--
-- Add links to edit im_timesheet_invoices objects...
insert into im_biz_object_urls (object_type, url_type, url) values (
'im_timesheet_invoice','view','/intranet-invoices/view?invoice_id=');
insert into im_biz_object_urls (object_type, url_type, url) values (
'im_timesheet_invoice','edit','/intranet-invoices/new?invoice_id=');
-- /packages/intranet-timesheet2-invoices/sql/oracle/intranet-timesheet2-invoices-create.sql
--
-- Copyright (c) 2003-2004 Project/Open
--
-- All rights reserved. Please check
-- http://www.project-open.com/license/ for details.
--
-- @author frank.bergmann@project-open.com
-- Timesheet Invoicing for Project/Open
--
-- Defines:
-- im_trans_prices List of prices with defaults
--
-- Add links to edit im_timesheet_invoices objects...
insert into im_biz_object_urls (object_type, url_type, url) values (
'im_timesheet_invoice','view','/intranet-invoices/view?invoice_id=');
insert into im_biz_object_urls (object_type, url_type, url) values (
'im_timesheet_invoice','edit','/intranet-invoices/new?invoice_id=');
sql/postgresql/intranet-timesheet2-invoices-drop.sql
View file @ a11cb4b4
-- /packages/intranet-trans-invoices/sql/oracle/intranet-trans-invoices-drop.sql
--
-- Copyright (c) 2003-2004 Project/Open
--
-- All rights reserved. Please check
-- http://www.project-open.com/license/ for details.
--
-- @author frank.bergmann@project-open.com
-- @author juanjoruizx@yahoo.es
select im_component_plugin__del_module('intranet-trans-invoices');
select im_menu__del_module( 'intranet-trans-invoices');
create or replace function inline_01 ()
returns integer as '
DECLARE
v_menu_id integer;
BEGIN
select menu_id into v_menu_id
from im_menus
where label = ''new_trans_invoice'';
PERFORM im_menu__delete(v_menu_id);
select menu_id into v_menu_id
from im_menus
where label = ''project_pos'';
PERFORM im_menu__delete(v_menu_id);
return 0;
end;' language 'plpgsql';
select inline_01 ();
drop function inline_01 ();
drop function im_trans_prices_calc_relevancy (
integer, integer, integer, integer, integer, integer, integer, integer, integer, integer
);
drop sequence im_trans_prices_seq;
drop table im_trans_prices;
-- delete all im_trans_invoices without
-- deleting the rest of all invoices...
create or replace function inline_02 ()
returns integer as '
declare
row RECORD;
begin
for row in
select invoice_id
from im_trans_invoices
loop
PERFORM im_trans_invoice__delete(row.invoice_id);
end loop;
return 0;
end;' language 'plpgsql';
select inline_02 ();
drop function inline_02 ();
-- delete links to edit im_trans_invoices objects...
delete from im_biz_object_urls where object_type = 'im_trans_invoice';
-- drop main table and object_type
drop table im_trans_invoices;
-- ---------------------------------------------
-- Delete translation invoices completely before
-- dropping the acs-objects
--
delete from im_invoice_items
where invoice_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from im_invoices
where invoice_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from im_payments
where cost_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from im_costs
where cost_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from acs_rels
where object_id_one in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from acs_rels
where object_id_two in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from acs_objects
where object_type = 'im_trans_invoice';
-- Now we can drop the object type
select acs_object_type__drop_type('im_trans_invoice', 'f');
-- /packages/intranet-trans-invoices/sql/oracle/intranet-trans-invoices-drop.sql
--
-- Copyright (c) 2003-2004 Project/Open
--
-- All rights reserved. Please check
-- http://www.project-open.com/license/ for details.
--
-- @author frank.bergmann@project-open.com
-- @author juanjoruizx@yahoo.es
select im_component_plugin__del_module('intranet-trans-invoices');
select im_menu__del_module( 'intranet-trans-invoices');
create or replace function inline_01 ()
returns integer as '
DECLARE
v_menu_id integer;
BEGIN
select menu_id into v_menu_id
from im_menus
where label = ''new_trans_invoice'';
PERFORM im_menu__delete(v_menu_id);
select menu_id into v_menu_id
from im_menus
where label = ''project_pos'';
PERFORM im_menu__delete(v_menu_id);
return 0;
end;' language 'plpgsql';
select inline_01 ();
drop function inline_01 ();
drop function im_trans_prices_calc_relevancy (
integer, integer, integer, integer, integer, integer, integer, integer, integer, integer
);
drop sequence im_trans_prices_seq;
drop table im_trans_prices;
-- delete all im_trans_invoices without
-- deleting the rest of all invoices...
create or replace function inline_02 ()
returns integer as '
declare
row RECORD;
begin
for row in
select invoice_id
from im_trans_invoices
loop
PERFORM im_trans_invoice__delete(row.invoice_id);
end loop;
return 0;
end;' language 'plpgsql';
select inline_02 ();
drop function inline_02 ();
-- delete links to edit im_trans_invoices objects...
delete from im_biz_object_urls where object_type = 'im_trans_invoice';
-- drop main table and object_type
drop table im_trans_invoices;
-- ---------------------------------------------
-- Delete translation invoices completely before
-- dropping the acs-objects
--
delete from im_invoice_items
where invoice_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from im_invoices
where invoice_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from im_payments
where cost_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from im_costs
where cost_id in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from acs_rels
where object_id_one in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from acs_rels
where object_id_two in (
select object_id
from acs_objects
where object_type = 'im_trans_invoice'
)
;
delete from acs_objects
where object_type = 'im_trans_invoice';
-- Now we can drop the object type
select acs_object_type__drop_type('im_trans_invoice', 'f');
www/invoices/new-2.tcl
View file @ a11cb4b4
......@@ -101,9 +101,10 @@ from
"]
if {$num_clients > 1} {
ad_return_complaint "[_ intranet-timesheet2-invoices.lt_You_have_selected_mul]" "
ad_return_complaint "[_ intranet-timesheet2-invoices.lt_You_have_selected_mul]" "
<li>[_ intranet-timesheet2-invoices.lt_You_have_selected_mul_1]<BR>
[_ intranet-timesheet2-invoices.lt_Please_backup_and_res]"
return
}
......@@ -169,16 +170,16 @@ set disabled_task_status_where "
set task_table "
<tr>
<td class=rowtitle align=middle>[im_gif help "Include in Invoice"]</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Task_Name]</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Material]</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Planned_Units]</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Billable_Units]</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Reported_Units]</td>
<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Task_Name "Task Name"]</td>
<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Material "Material"]</td>
<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Planned_Units "Planned Units"]</td>
<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Billable_Units "Billable Units"]</td>
<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Reported_Units "Reported Units"]</td>
<td class=rowtitle>
[_ intranet-timesheet2-invoices.UoM] [im_gif help "Unit of Measure"]
[lang::message::lookup "" intranet-timesheet2-invoices.UoM "UoM"] [im_gif help "Unit of Measure"]
</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Type]</td>
<td class=rowtitle>[_ intranet-timesheet2-invoices.Status]</td>
<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Type Type]</td>
<td class=rowtitle>[lang::message::lookup "" intranet-timesheet2-invoices.Status Status]</td>
</tr>
<tr>
<td></td>
......@@ -203,7 +204,7 @@ db_foreach select_tasks $sql {
<tr><td colspan=$colspan>&nbsp;</td></tr>
<tr>
<td class=rowtitle colspan=$colspan>
<A href=/intranet/projects/view?group_id=$project_id>
<A href=/intranet/projects/view?project_id=$project_id>
$project_short_name
</A>:
$project_name
......@@ -233,12 +234,12 @@ db_foreach select_tasks $sql {
if {![string equal "" $task_table_rows]} {
append task_table $task_table_rows
} else {
append task_table "<tr><td colspan=$colspan align=center>[_ intranet-timesheet2-invoices.No_tasks_found]</td></tr>"
append task_table "<tr><td colspan=$colspan align=center>[lang::message::lookup "" intranet-timesheet2-invoices.No_tasks_found "No tasks found"]</td></tr>"
}
set deselect_button_html "
<tr><td colspan=7 align=right>
<input type=submit name=submit value='[_ intranet-timesheet2-invoices.lt_Select_Tasks_for_Invo]'>
<input type=submit name=submit value='[lang::message::lookup "" intranet-timesheet2-invoices.lt_Select_Tasks_for_Invo "Select Tasks for Invoicing"]'>
</td></tr>
<tr><td>&nbsp;</td></tr>
"
......
www/invoices/new-3-postgresql.xql
View file @ a11cb4b4
......@@ -19,6 +19,7 @@
select
c.*,
o.*,
c.default_invoice_template_id as template_id,
im_email_from_user_id(c.accounting_contact_id) as company_contact_email,
im_name_from_user_id(c.accounting_contact_id) as company_contact_name,
c.company_name,
......
www/invoices/new-3.adp
View file @ a11cb4b4
......@@ -59,9 +59,9 @@
#intranet-timesheet2-invoices.Payment_Method#
</td>
<td class=rowodd>
[im_invoice_payment_method_select payment_method_id $payment_method_id]
<%= [im_invoice_payment_method_select payment_method_id $payment_method_id] %>
</td>
</tr>\n"
</tr>
</if>
<tr>
......
www/invoices/new-3.tcl
View file @ a11cb4b4
......@@ -68,6 +68,13 @@ set tasks_where_clause "task_id in ([join $in_clause_list ","])"
# We already know that all tasks are from the same company,
# and we asume that the company_id is set from new-2.tcl.
if { [catch {
db_1row invoices_info_query ""
} err_msg] } {
ad_return_complaint 1 [lang::message::lookup "" intranet-timesheet2-invoices.Company_not_found "We didn't find any information about company\# %company_id%."]
}
# Create the default values for a new invoice.
#
# Calculate the next invoice number by calculating the maximum of
......@@ -77,7 +84,7 @@ set button_text "[_ intranet-timesheet2-invoices.Create_Invoice]"
set page_title "[_ intranet-timesheet2-invoices.New_Invoice]"
set context_bar [im_context_bar [list /intranet/invoices/ "[_ intranet-timesheet2-invoices.Invoices]"] $page_title]
set invoice_id [im_new_object_id]
set invoice_nr [im_next_invoice_nr]
set invoice_nr [im_next_invoice_nr -invoice_type_id $target_cost_type_id]
set invoice_date $todays_date
set payment_days [ad_parameter -package_id [im_package_cost_id] "DefaultCompanyInvoicePaymentDays" "" 30]
set due_date [db_string get_due_date "select to_date(to_char(sysdate,'YYYY-MM-DD'),'YYYY-MM-DD') + $payment_days from dual"]
......@@ -94,30 +101,6 @@ set payment_method_id ""
set template_id ""
# ---------------------------------------------------------------
# Gather company data from company_id
# ---------------------------------------------------------------
db_1row invoices_info_query "
select
c.*,
o.*,
im_email_from_user_id(c.accounting_contact_id) as company_contact_email,
im_name_from_user_id(c.accounting_contact_id) as company_contact_name,
c.company_name,
c.company_path,
c.company_path as company_short_name,
cc.country_name
from
im_companies c,
im_offices o,
country_codes cc
where
c.company_id = :company_id
and c.main_office_id=o.office_id(+)
and o.address_country_code=cc.iso(+)
"
# ---------------------------------------------------------------
# 6. Select and render invoicable items
# ---------------------------------------------------------------
......@@ -430,6 +413,4 @@ foreach task_id $in_clause_list {
append include_task_html "<input type=hidden name=include_task value=$task_id>\n"
}
db_release_unused_handles
ad_return_template
\ No newline at end of file
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