diff -uNr JobTracker-1.5.5/invoicehtml.php /kees/projects/naboo-httpd/html/jobs/invoicehtml.php --- JobTracker-1.5.5/invoicehtml.php Tue Dec 11 10:25:58 2001 +++ /kees/projects/naboo-httpd/html/jobs/invoicehtml.php Thu Sep 5 10:23:09 2002 @@ -32,7 +32,7 @@ if ($JobsPresent=='true') { $JobsPresent = 'false'; - $jobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, Starttijd, Stoptijd, Pauze, (time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600 as duration, Tarief, (Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600)) as total, BTW, (0.01*BTW*(Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600))) as totalbtw from Jobs where CustomerID=$CustomerID and Datum between '$Startdate' and '$Stopdate' and Billed = 'No' and CompanyID=$CompanyID order by Datum", $db); + $jobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, YEAR(Datum)as year, Starttijd, Stoptijd, Pauze, (time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600 as duration, Tarief, (Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600)) as total, BTW, (0.01*BTW*(Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600))) as totalbtw from Jobs where CustomerID=$CustomerID and Datum between '$Startdate' and '$Stopdate' and Billed = 'No' and CompanyID=$CompanyID order by Datum", $db); checkMySQLError(); if ($jobs_row = mysql_fetch_array($jobs_result)) { @@ -57,7 +57,7 @@ echo ("$lDate $lDescription $lStartTime$lStopTime$lHours$lRate $lTotal\n"); echo ("\n"); } - printf(" \n %s-%s %s %s %s %s %s %s \n", $jobs_row["day"], $jobs_row["month"], $jobs_row["Omschrijving"], $jobs_row["Starttijd"], $jobs_row["Stoptijd"], $jobs_row["duration"], $jobs_row["Tarief"], $jobs_row["total"]); + printf(" \n %s %s %s %s %s %s %s \n", date($lStrFTime,mktime(0,0,0, $jobs_row["month"], $jobs_row["day"], $jobs_row["year"])), $jobs_row["Omschrijving"], $jobs_row["Starttijd"], $jobs_row["Stoptijd"], $jobs_row["duration"], $jobs_row["Tarief"], $jobs_row["total"]); $tmpJobID=$jobs_row["JobID"]; $result = mysql_query("update Jobs set Billed = 'Yes', BilledonInv = $InvoiceID where JobID = $tmpJobID and Billed= 'No' and CompanyID=$CompanyID", $db); @@ -78,7 +78,7 @@ # select fixedjobs - $fjobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from FixedJobs where CustomerID=$CustomerID and Datum between '$Startdate' and '$Stopdate' and Billed = 'No' and CompanyID=$CompanyID order by Datum", $db); + $fjobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, YEAR(Datum)as year, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from FixedJobs where CustomerID=$CustomerID and Datum between '$Startdate' and '$Stopdate' and Billed = 'No' and CompanyID=$CompanyID order by Datum", $db); checkMySQLError(); if ($fjobs_row = mysql_fetch_array($fjobs_result)) { @@ -102,7 +102,7 @@ echo (" $lDate $lDescription $lCount $lPrice$lTotal\n"); echo ("\n"); } - printf(" \n %s-%s %s %s %s %s \n", $fjobs_row["day"], $fjobs_row["month"], $fjobs_row["Omschrijving"], $fjobs_row["Aantal"], $fjobs_row["Prijs"], $fjobs_row["total"]); + printf(" \n %s %s %s %s %s \n", date($lStrFTime,mktime(0,0,0, $fjobs_row["month"], $fjobs_row["day"], $fjobs_row["year"])), $fjobs_row["Omschrijving"], $fjobs_row["Aantal"], $fjobs_row["Prijs"], $fjobs_row["total"]); $tmpJobID=$fjobs_row["JobID"]; $result = mysql_query("update FixedJobs set Billed = 'Yes', BilledonInv = $InvoiceID where JobID = $tmpJobID and Billed= 'No' and CompanyID=$CompanyID", $db); @@ -126,7 +126,7 @@ if ($ThingsPresent=='true') { $ThingsPresent = 'false'; - $things_result = mysql_query("select ThingID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from Things where CustomerID=$CustomerID and Datum between '$Startdate' and '$Stopdate' and Billed = 'No' and CompanyID=$CompanyID order by Datum", $db); + $things_result = mysql_query("select ThingID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, YEAR(Datum) as year, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from Things where CustomerID=$CustomerID and Datum between '$Startdate' and '$Stopdate' and Billed = 'No' and CompanyID=$CompanyID order by Datum", $db); checkMySQLError(); if ($things_row = mysql_fetch_array($things_result)) { @@ -150,7 +150,7 @@ echo (" $lDate $lDescription $lCount $lPrice$lTotal\n"); echo ("\n"); } - printf(" \n %s-%s %s %s %s %s \n", $things_row["day"], $things_row["month"], $things_row["Omschrijving"], $things_row["Aantal"], $things_row["Prijs"], $things_row["total"]); + printf(" \n %s %s %s %s %s \n", date($lStrFTime,mktime(0,0,0, $things_row["month"], $things_row["day"], $things_row["year"])), $things_row["Omschrijving"], $things_row["Aantal"], $things_row["Prijs"], $things_row["total"]); $tmpThingID=$things_row["ThingID"]; $result = mysql_query("update Things set Billed = 'Yes', BilledonInv = $InvoiceID where ThingID = $tmpThingID and Billed= 'No' and CompanyID=$CompanyID", $db); diff -uNr JobTracker-1.5.5/invoicepdf.php /kees/projects/naboo-httpd/html/jobs/invoicepdf.php --- JobTracker-1.5.5/invoicepdf.php Tue Dec 11 10:58:09 2001 +++ /kees/projects/naboo-httpd/html/jobs/invoicepdf.php Mon May 6 15:12:31 2002 @@ -199,7 +199,7 @@ $invoice_row = mysql_fetch_array($invoice_result); $InvoiceID=$invoice_row["last_inv"]+1; -$date = date("d-m-Y"); +$date = date($lStrFTime); $fontsize = to_cm(12); $font = PDF_findfont($p, "Times-Roman", "host", 0); diff -uNr JobTracker-1.5.5/lang/english.php /kees/projects/naboo-httpd/html/jobs/lang/english.php --- JobTracker-1.5.5/lang/english.php Tue Dec 11 11:20:18 2001 +++ /kees/projects/naboo-httpd/html/jobs/lang/english.php Mon May 6 15:11:06 2002 @@ -31,8 +31,9 @@ $lJobDoneBy="Done by"; $lDescription="Description"; $lDate="Date"; -$lStartTime="Starttime"; -$lStopTime="Stoptime"; +$lStrFTime="d-m-Y"; +$lStartTime="Start"; +$lStopTime="Finish"; $lBreak="Break"; $lRate="Rate"; $lBTW="VAT"; @@ -44,16 +45,16 @@ $lBTWNull="VAT zero"; $lDuration="Duration"; $lBilled="Billed"; -$lPayed="Payed"; +$lPayed="Paid"; $lTotal="Total"; $lFrom="From"; $lTill="Till"; -$lDefaultStartTime="Default starttime"; -$lDefaultStopTime="Default stoptime"; -$lDefaultBreakTime="Default break"; -$lDefaultJobRate="Default rate"; +$lDefaultStartTime="Default Start Time"; +$lDefaultStopTime="Default Stop Time"; +$lDefaultBreakTime="Default Break Time"; +$lDefaultJobRate="Default Rate"; $lDefaultDaysToPay="Default days to pay"; # IDs @@ -82,7 +83,7 @@ $lSorryNoNameGiven="No name given"; $lNotAllowed="Not allowed!"; $lSorryNotAllValuesGiven="Not all required field filled in"; -$lSorryInvoiceIDToLow="The given last invoicenumer is too low, invoicenumer should be higher as the numeber of the last generated invoice:"; +$lSorryInvoiceIDToLow="The given last invoicenumber is too low, invoicenumber should be higher as the numeber of the last generated invoice:"; $lAllJobsBetween="All jobs between"; $lAllFixedJobsBetween="All jobs between"; @@ -94,7 +95,7 @@ $lYourReminderIsGenerated="The reminder is generated"; $lYourInvoiceIsGenerated="The invoice is regenerated"; -$lSorryThatUserNameExists="Sorry that username is allready in use"; +$lSorryThatUserNameExists="Sorry that username is already in use"; # showfunctions $lShowCompany="View company"; @@ -219,6 +220,7 @@ //------------------------------------------------------------------ // invoice +$lFrom="From"; $lTo="To"; $lInvoice="INVOICE"; $lReminder="REMINDER"; @@ -228,8 +230,8 @@ $lToPay="To pay"; $lPaymentIn="Payment in"; $lDays="days"; -$lPaymentMark="Please include this sign when paying:"; -$lDeliverdServicesGoods="Goods / services deliverd to you"; +$lPaymentMark="Please include this reference number when paying:"; +$lDeliverdServicesGoods="Goods / services delivered to you"; $lCreateReminder="Create reminder"; //------------------------------------------------------------------ @@ -249,7 +251,7 @@ $lWelcomeMessage=" Yeah!

Welcome to $BRAND! -

you can put some message here... +

Make some cash! "; diff -uNr JobTracker-1.5.5/lang/italian.php /kees/projects/naboo-httpd/html/jobs/lang/italian.php --- JobTracker-1.5.5/lang/italian.php Tue Dec 11 11:11:34 2001 +++ /kees/projects/naboo-httpd/html/jobs/lang/italian.php Mon May 6 15:11:18 2002 @@ -32,6 +32,7 @@ $lJobDoneBy="Fatto da"; $lDescription="Descrizione"; $lDate="Data"; +$lStrFTime="d-m-Y"; $lStartTime="Starttime"; $lStopTime="Stoptime"; $lBreak="Break"; diff -uNr JobTracker-1.5.5/lang/nederlands.php /kees/projects/naboo-httpd/html/jobs/lang/nederlands.php --- JobTracker-1.5.5/lang/nederlands.php Tue Dec 11 11:20:31 2001 +++ /kees/projects/naboo-httpd/html/jobs/lang/nederlands.php Mon May 6 15:11:27 2002 @@ -31,6 +31,7 @@ $lJobDoneBy="Gedaan door"; $lDescription="Omschrijving"; $lDate="Datum"; +$lStrFTime="d-m-Y"; $lStartTime="Starttijd"; $lStopTime="Stoptijd"; $lBreak="Pauze"; diff -uNr JobTracker-1.5.5/lang/us_english.php /kees/projects/naboo-httpd/html/jobs/lang/us_english.php --- JobTracker-1.5.5/lang/us_english.php Wed Dec 31 16:00:00 1969 +++ /kees/projects/naboo-httpd/html/jobs/lang/us_english.php Mon May 6 15:40:39 2002 @@ -0,0 +1,306 @@ +Yeah!
+

Welcome to $BRAND! +

Make some cash! +"; + + +$lExtendedInfo=" +

Who's looking for $BRAND?
+

$BRAND is meant for small companies with one or more employees. +

$BRAND was first developed for the inhouse tracking of spent time on a job for a particular customer. Because the system worked so well, it was decided to make it also accessible for others. Also the functionality increased, like the addition of tracking sold articles, and the direct printing of invoices. +
+

What is $BRAND?
+

$BRAND is a web-application to manage the work done and articles sold by you or your or one of your employees. +

According to the entered data $BRAND can generate overviews and print invoices. +
+

Why $BRAND?
+

$BRAND keeps a clear track of your activities and is the only system which combines timetracking and billing, this can save you a lot of time and/or money. +

Invoices are generated in PDF format, you need to download PDF-viewer at no cost from abobe software, in teh case no pdf viewer is installed on your system. +
+

How does it work?
+

This is only a short manual of the system, a more complete reference will be written when more time is availabe. +

customer details
customer details
+

After signing up you need to enter a customer before you can keep track of your activities. When a customer is entered you can enter either hourly based work (with start- stoptime), work at a fixed rate (without start- stoptime), or articles delivered by your company. +

customeroverview
customeroverview
+

hourly billed job
hourly billed job
+

When some at least something is entered you're able to create an invoice. Using a start and stopdate everything in that period is selected, then you can select the individual activities/articles. +

invoice in pdf format
invoice in pdf format
+

When something is billed, it cannot be modified or deleted anymore, unless the invoice is deleted. When the status of the invoice is set to 'paid' the invoice cannot be modified or deleted. When the invoice hasn't been set to paid after the number of days it has to be payed within, the 'Payed' column, shows a red 'No', and a reminder can be generated. +

Be cautious when deleting a customer, all data af the customer will be lost! +

Because of this danger the 'administrator' (the user who signed up for $BRAND) can create users (non-administrators) who don't have the permission to delete customers, as well they can't delete other users, nor invoices. The use of a different user fot each employee also comes in handy when entering activities or articles, which user did what is easy tracked that way. +

For each user a default start- stoptime, break, and rate can be entered, this data shows up automatically when entering a new hourly-based job. +

There are also some general settings that can be modified by the administrator(s) only, like Tax and the companies data. +

Furthermore there is the function to search within the system, searched can be in the Customer, Job and Article databases. +
+

How about security?
+

$BRAND uses SSL encryption to encrypt the data dend over the internet. You will have to enable encryption by installing the SSL certificate presented by $BRAND, this will be presented as soon as you access the secured section. In Internet explorer you'll have to click the More or Advanced button, and Install certificate, this will show up the certificate installation wizard, in Netscape you can install the certificate right away. +

You can check the encryption status by clicking on the lock-icon in your browser. In Internet Explorer a lock will show up in the statusbar when accessing the secure area, in Netscape the lock will have a yellow shining around it. +

When you don't install the certificate the system will work without troubles anyway, but the data will not be encrypted. +
+

What does $BRAND cost?
+

$BRAND is absolutely free! +

When you'd like to have this software you can get the source here, this software is distributed under the GPL. + +

%s
+

Wishlist: +

  • Invoices send by email +
  • Possibility to let your customers login and check their data. + +

    Some current problems: +

  • Invoices restricted to one page. + +"; + + +?> diff -uNr JobTracker-1.5.5/showinvoicehtml.php /kees/projects/naboo-httpd/html/jobs/showinvoicehtml.php --- JobTracker-1.5.5/showinvoicehtml.php Tue Dec 11 10:26:35 2001 +++ /kees/projects/naboo-httpd/html/jobs/showinvoicehtml.php Thu Sep 5 10:21:32 2002 @@ -31,7 +31,7 @@ $TotJobsPresent = 'false'; $JobsPresent = 'false'; -$jobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, Starttijd, Stoptijd, Pauze, (time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600 as duration, Tarief, (Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600)) as total, BTW, (0.01*BTW*(Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600))) as totalbtw from Jobs where BilledOnInv=$InvoiceID and CompanyID=$CompanyID order by Datum", $db); +$jobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, YEAR(Datum)as year, Starttijd, Stoptijd, Pauze, (time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600 as duration, Tarief, (Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600)) as total, BTW, (0.01*BTW*(Tarief*((time_to_sec(Stoptijd +0)-time_to_sec(Starttijd+0)-time_to_sec(Pauze +0))/3600))) as totalbtw from Jobs where BilledOnInv=$InvoiceID and CompanyID=$CompanyID order by Datum", $db); checkMySQLError(); if ($jobs_row = mysql_fetch_array($jobs_result)) { @@ -50,7 +50,7 @@ echo ("$lDate $lDescription $lStartTime$lStopTime$lHours$lRate $lTotal\n"); echo ("\n"); } - printf(" \n %s-%s %s %s %s %s %s %s \n", $jobs_row["day"], $jobs_row["month"], $jobs_row["Omschrijving"], $jobs_row["Starttijd"], $jobs_row["Stoptijd"], $jobs_row["duration"], $jobs_row["Tarief"], $jobs_row["total"]); + printf(" \n %s %s %s %s %s %s %s \n", date($lStrFTime,mktime(0,0,0,$jobs_row["month"], $jobs_row["day"], $jobs_row["year"])), $jobs_row["Omschrijving"], $jobs_row["Starttijd"], $jobs_row["Stoptijd"], $jobs_row["duration"], $jobs_row["Tarief"], $jobs_row["total"]); $totexclbtw = $totexclbtw + $jobs_row["total"]; $totbtw = $totbtw + $jobs_row["totalbtw"]; @@ -60,7 +60,7 @@ } $FixedJobsPresent = 'false'; -$fjobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from FixedJobs where BilledOnInv=$InvoiceID and CompanyID=$CompanyID order by Datum", $db); +$fjobs_result = mysql_query("select JobID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, YEAR(Datum) as year, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from FixedJobs where BilledOnInv=$InvoiceID and CompanyID=$CompanyID order by Datum", $db); checkMySQLError(); if ($fjobs_row = mysql_fetch_array($fjobs_result)) { @@ -78,7 +78,7 @@ echo (" $lDate $lDescription $lCount $lPrice$lTotal\n"); echo ("\n"); } - printf(" \n %s-%s %s %s %s %s \n", $fjobs_row["day"], $fjobs_row["month"], $fjobs_row["Omschrijving"], $fjobs_row["Aantal"], $fjobs_row["Prijs"], $fjobs_row["total"]); + printf(" \n %s %s %s %s %s \n", date($lStrFTime,mktime(0,0,0,$fjobs_row["month"], $fjobs_row["day"], $fjobs_row["year"])), $fjobs_row["Omschrijving"], $fjobs_row["Aantal"], $fjobs_row["Prijs"], $fjobs_row["total"]); $totexclbtw = $totexclbtw + $fjobs_row["total"]; $totbtw = $totbtw + $fjobs_row["totalbtw"]; @@ -92,7 +92,7 @@ echo(""); } $ThingsPresent = 'false'; -$things_result = mysql_query("select ThingID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from Things where BilledOnInv=$InvoiceID and CompanyID=$CompanyID order by Datum", $db); +$things_result = mysql_query("select ThingID, CustomerID, Omschrijving, Datum, DAYOFMONTH(Datum)as day, MONTH(Datum)as month, YEAR(Datum) as year, Aantal, Prijs, (Aantal*Prijs) as total, BTW, (BTW*0.01*Aantal*Prijs) as totalbtw from Things where BilledOnInv=$InvoiceID and CompanyID=$CompanyID order by Datum", $db); checkMySQLError(); if ($things_row = mysql_fetch_array($things_result)) { @@ -110,7 +110,7 @@ echo (" $lDate $lDescription $lCount $lPrice$lTotal\n"); echo ("\n"); } - printf(" \n %s-%s %s %s %s %s \n", $things_row["day"], $things_row["month"], $things_row["Omschrijving"], $things_row["Aantal"], $things_row["Prijs"], $things_row["total"]); + printf(" \n %s %s %s %s %s \n", date($lStrFTime,mktime(0,0,0,$things_row["month"], $things_row["day"], $things_row["year"])), $things_row["Omschrijving"], $things_row["Aantal"], $things_row["Prijs"], $things_row["total"]); $totexclbtw = $totexclbtw + $things_row["total"]; $totbtw = $totbtw + $things_row["totalbtw"]; diff -uNr JobTracker-1.5.5/sistt-generalfunctions.php /kees/projects/naboo-httpd/html/jobs/sistt-generalfunctions.php --- JobTracker-1.5.5/sistt-generalfunctions.php Mon Oct 29 08:16:20 2001 +++ /kees/projects/naboo-httpd/html/jobs/sistt-generalfunctions.php Mon May 6 15:39:36 2002 @@ -641,14 +641,23 @@ * */ function form_to_db($date, $delimiter="-" ) { - if (ereg ("([0-9]{1,2})$delimiter([0-9]{1,2})$delimiter([0-9]{2,4})", $date, $regs)) { - if(strlen($regs[1]) <2) $regs[1] = "0$regs[1]"; - if(strlen($regs[2]) <2) $regs[2] = "0$regs[2]"; - if(strlen($regs[3]) <4) $regs[3] = "20$regs[3]"; // this will work for the next 998 years - return "$regs[3]-$regs[2]-$regs[1]"; - } else { - return FALSE; + $stamp=strtotime($date); + if ($stamp != -1) + { + return date("Ymd",$stamp); } + else + { + return FALSE; + } +# if (ereg ("([0-9]{1,2})$delimiter([0-9]{1,2})$delimiter([0-9]{2,4})", $date, $regs)) { +# if(strlen($regs[1]) <2) $regs[1] = "0$regs[1]"; +# if(strlen($regs[2]) <2) $regs[2] = "0$regs[2]"; +# if(strlen($regs[3]) <4) $regs[3] = "20$regs[3]"; // this will work for the next 998 years +# return "$regs[3]-$regs[2]-$regs[1]"; +# } else { +# return FALSE; +# } } /** @@ -661,7 +670,8 @@ $d[day] = substr($date, 8, 2); $d[month] = substr($date, 5, 2); $d[year] = substr($date, 0, 4); - return $d[day].$delimiter.$d[month].$delimiter.$d[year]; +# return $d[day].$delimiter.$d[month].$delimiter.$d[year]; + return date("M d, Y",mktime(0,0,0,$d[month],$d[day],$d[year])); } function db_to_value($date) { diff -uNr JobTracker-1.5.5/sistt-invoicefunctions.php /kees/projects/naboo-httpd/html/jobs/sistt-invoicefunctions.php --- JobTracker-1.5.5/sistt-invoicefunctions.php Tue Dec 11 10:25:30 2001 +++ /kees/projects/naboo-httpd/html/jobs/sistt-invoicefunctions.php Thu Sep 5 10:09:27 2002 @@ -20,16 +20,23 @@ require("lang/".$Language); $db = getDBConnection(); + $company_result = mysql_query("select * from Companies where CompanyID=$CompanyID", $db); + $company_row = mysql_fetch_array($company_result); + checkMySQLError(); + $customer_result = mysql_query("select * from Klanten where CustomerID=$CustomerID and CompanyID=$CompanyID", $db); $customer_row = mysql_fetch_array($customer_result); checkMySQLError(); mysql_close($db); - if ($Date==0){$date = date("d-m-Y");} + if ($Date==0){$date = date($lStrFTime);} else {$date = $Date;} echo "
    "; - echo(""); + echo("
    "); + /* HEIGHT=\"945\">"); */ + +/* echo(" "); echo(" "); @@ -47,9 +54,46 @@ echo("  "); echo(" "); +*/ + + echo(" "); echo(" "); echo(" "); echo("
    "); echo("  
    "); echo(" "); + + echo(" "); + echo(" "); + echo(" "); + echo(" "); + + + + echo(" "); echo(" "); @@ -70,12 +114,19 @@ echo(" "); printf(" ",$customer_row["land"]); echo(" "); + echo(" "); + printf(" ",$customer_row["telno"]); + echo(" "); echo("
    "); + echo("  $lFrom:"); + echo(" "); + echo(" "); + echo(" "); + echo(" "); + echo("
    "); + echo(" "); + echo(" "); + printf(" ",$company_row["Naam"]); + echo(" "); + echo(" "); + printf(" ",$company_row["Adres"]); + echo(" "); + echo(" "); + printf(" ",$company_row["pcplaats"]); + echo(" "); + echo(" "); + printf(" ",$company_row["land"]); + echo(" "); + echo(" "); + printf(" ",$company_row["telno"]); + echo(" "); + echo("
     %s
     %s
     %s
     %s
     %s
    "); + echo("
    "); + echo("
    "); echo("  $lTo:
     %s
     %s
    "); echo("
    "); echo(" "); echo(" "); + + + + echo(" "); echo(" "); echo(" "); @@ -129,8 +180,11 @@ echo(" "); echo(" "); echo(" "); + + + echo(" "); - echo(" "); echo(" "); @@ -160,7 +214,7 @@ { require("lang/".$Language); echo(""); - echo(" "); + echo(" "); echo(""); } @@ -192,33 +246,35 @@ echo(" "); echo(" "); - echo(" "); - echo(" "); + echo(" \n"); +/* "); */ echo(" "); echo(" "); echo(" "); - echo(" "); - echo(" "); echo(" "); echo(" "); echo(" "); - echo(" "); - echo(" "); + echo(" \n"); +/* "); */ echo(" "); echo(" "); echo(" "); - echo(" "); - echo(" "); echo(" "); echo("
    "); + echo(" "); echo("  "); echo("  
    $lRemark$lRemark: $opmerking
    "); echo("  "); + echo(" "); echo("  $lCurrency"); - echo("  $CURRENCY "); + echo("  $CURRENCY
    "); echo("  "); + echo(" "); echo("  $lTotalExclVat"); + echo(" "); echo("  $totexclbtw
    "); echo("
     $lPaymentIn $Daystopay $lDays
    		"); + echo(" "); echo("  $lTotalVat"); - echo("  $totbtw "); + echo("  $totbtw
    "); echo("  "); + echo(" "); echo("  $lToPay"); + echo(" "); echo("  $tot
    "); diff -uNr JobTracker-1.5.5/sistt.php /kees/projects/naboo-httpd/html/jobs/sistt.php --- JobTracker-1.5.5/sistt.php Sun Oct 28 06:36:34 2001 +++ /kees/projects/naboo-httpd/html/jobs/sistt.php Mon May 6 15:54:47 2002 @@ -119,7 +119,8 @@ else { echo "Nederlands\n"; - echo "English\n"; + echo "UK English\n"; + echo "US English\n"; echo "Italian\n"; }