Debugging @sls:

- Fixed error when editing invoices when the acs_rel invoice->project
  already exists
- Started writing update script

intranet-invoices.info

@@ -12,8 +12,9 @@
         <owner url="mailto:fraber@fraber.de">Frank Bergmann</owner>
         <vendor url="http://www.project-open.com/">Project/Open</vendor>
 
-        <provides url="intranet-invoices" version="2.0.1"/>
-        <requires url="intranet-core" version="2.0.1"/>
+        <provides url="intranet-invoices" version="2.1.0"/>
+        <requires url="intranet-core" version="2.1.0"/>
+        <requires url="intranet-payments" version="2.1.0"/>
 
         <callbacks>
         </callbacks>

sql/oracle/intranet-invoices-create.sql

@@ -385,26 +385,21 @@ insert into im_view_columns (column_id, view_id, group_id, column_name, column_r
 extra_select, extra_where, sort_order, visible_for) values (3001,30,NULL,'Document #',
 '"<A HREF=/intranet-invoices/view?invoice_id=$invoice_id>$invoice_nr</A>"',
 '','',1,'');
-
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3002,30,NULL,'Preview',
 '"<A HREF=/intranet-invoices/view?invoice_id=$invoice_id${amp}render_template_id=$template_id>
 $invoice_nr</A>"','','',2,'');
-
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3003,30,NULL,'Type',
 '$cost_type','','',3,'');
-
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3004,30,NULL,'Provider',
 '"<A HREF=/intranet/customers/view?customer_id=$provider_id>$provider_name</A>"',
 '','',4,'');
-
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3005,30,NULL,'Client',
 '"<A HREF=/intranet/customers/view?customer_id=$customer_id>$customer_name</A>"',
 '','',5,'');
-
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3007,30,NULL,'Due Date',
 '[if {$overdue > 0} {
@@ -412,25 +407,22 @@ extra_select, extra_where, sort_order, visible_for) values (3007,30,NULL,'Due Da
 } else {
 	set t "$due_date_calculated"
 }]','','',7,'');
-
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3011,30,NULL,'Amount',
-'$invoice_amount_formatted $invoice_currency','','',11,'');
-
+'"$invoice_amount_formatted $invoice_currency"','','',11,'');
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3013,30,NULL,'Paid',
-'$payment_amount $payment_currency','','',13,'');
-
+'"$payment_amount $payment_currency"','','',13,'');
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3017,30,NULL,'Status',
 '[im_cost_status_select "invoice_status.$invoice_id" $invoice_status_id]','','',17,'');
-
 insert into im_view_columns (column_id, view_id, group_id, column_name, column_render_tcl,
 extra_select, extra_where, sort_order, visible_for) values (3098,30,NULL,'Del',
 '[if {[string equal "" $payment_amount]} {
-	set ttt "<input type=checkbox name=del_cost value=$invoice_id><input type=hidden name=object_type.$invoice_id value=$object_type>"
+	set ttt "
+		<input type=checkbox name=del_cost value=$invoice_id>
+		<input type=hidden name=object_type.$invoice_id value=$object_type>"
 }]','','',99,'');
-
 --
 commit;
 

www/list.tcl

@@ -200,7 +200,7 @@ switch $order_by {
     "Preview" { set order_by_clause "order by invoice_nr" }
     "Provider" { set order_by_clause "order by provider_name" }
     "Client" { set order_by_clause "order by customer_name" }
-    "Due Date" { set order_by_clause "order by (i.invoice_date+i.payment_days)" }
+    "Due Date" { set order_by_clause "order by (ci.effective_date + ci.payment_days)" }
     "Amount" { set order_by_clause "order by ii.invoice_amount" }
     "Paid" { set order_by_clause "order by pa.payment_amount" }
     "Status" { set order_by_clause "order by invoice_status_id" }
@@ -243,7 +243,7 @@ if { [db_table_exists im_payments] } {
 set sql "
 select
         i.*,
-	i.invoice_date + i.payment_days as due_date_calculated,
+	(i.invoice_date + i.payment_days) as due_date_calculated,
 	o.object_type,
 	ii.invoice_amount,
 	ii.invoice_currency,

www/new-2.tcl

@@ -201,11 +201,20 @@ foreach project_id $select_project {
     db_dml insert_acs_rels "
         DECLARE
                 v_rel_id        integer;
+		v_rel_exists	integer;
         BEGIN
-                v_rel_id := acs_rel.new(
-                        object_id_one => :project_id,
-                        object_id_two => :invoice_id
-                );
+		select	count(*)
+		into	v_rel_exists
+		from	acs_rels
+		where	object_id_one = :project_id
+			and object_id_two = :invoice_id;
+
+		if 0 = v_rel_exists then
+	                v_rel_id := acs_rel.new(
+	                        object_id_one => :project_id,
+	                        object_id_two => :invoice_id
+	                );
+		end if;
         END;"
 }
 

www/new.tcl

@@ -106,8 +106,8 @@ from
 	im_customers p
 where 
         i.invoice_id=:invoice_id
-	and ci.customer_id=c.customer_id(+)
-	and ci.provider_id=p.customer_id(+)
+	and ci.customer_id = c.customer_id(+)
+	and ci.provider_id = p.customer_id(+)
 	and i.invoice_id = ci.cost_id
 "
 
@@ -190,8 +190,6 @@ set customer_select [im_customer_select customer_id $customer_id "" "Customer"]
 set provider_select [im_customer_select provider_id $provider_id "" "Provider"]
 
 
-
-
 # ---------------------------------------------------------------
 # 7. Select and format the sum of the invoicable items
 # for a new invoice