[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4673] trunk
- Subject: SF.net SVN: ledger-smb:[4673] trunk
- From: ..hidden..
- Date: Tue, 24 Apr 2012 11:48:41 +0000
Revision: 4673
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4673&view=rev
Author: einhverfr
Date: 2012-04-24 11:48:40 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/Form.pm
trunk/LedgerSMB/IC.pm
trunk/LedgerSMB/Template/LaTeX.pm
trunk/LedgerSMB/Template/TXT.pm
trunk/UI/menu/expanding.html
trunk/sql/modules/Reconciliation.sql
trunk/sql/modules/Roles.sql
trunk/templates/demo/ap_transaction.html
trunk/templates/demo/ar_transaction.html
trunk/templates/demo/bin_list.html
trunk/templates/demo/bin_list.tex
trunk/templates/demo/packing_list.html
trunk/templates/demo/packing_list.tex
trunk/templates/demo/pick_list.html
trunk/templates/demo/pick_list.tex
trunk/templates/demo/purchase_order.html
trunk/templates/demo/purchase_order.tex
trunk/templates/demo/request_quotation.html
trunk/templates/demo/sales_order.html
trunk/templates/demo/sales_quotation.html
trunk/templates/demo/statement.html
trunk/templates/demo/timecard.html
trunk/templates/demo/work_order.html
trunk/templates/demo/work_order.tex
trunk/templates/xedemo/ap_transaction.html
trunk/templates/xedemo/ar_transaction.html
trunk/templates/xedemo/bin_list.html
trunk/templates/xedemo/bin_list.tex
trunk/templates/xedemo/packing_list.html
trunk/templates/xedemo/packing_list.tex
trunk/templates/xedemo/pick_list.html
trunk/templates/xedemo/pick_list.tex
trunk/templates/xedemo/purchase_order.html
trunk/templates/xedemo/purchase_order.tex
trunk/templates/xedemo/request_quotation.html
trunk/templates/xedemo/sales_order.html
trunk/templates/xedemo/sales_quotation.html
trunk/templates/xedemo/statement.html
trunk/templates/xedemo/timecard.html
trunk/templates/xedemo/work_order.html
trunk/templates/xedemo/work_order.tex
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/customer.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/journal.pm
trunk/LedgerSMB/Scripts/login.pm
trunk/LedgerSMB/Scripts/menu.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Scripts/taxform.pm
trunk/LedgerSMB/Scripts/vendor.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4633
+ /branches/1.3:3711-4672
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/Changelog 2012-04-24 11:48:40 UTC (rev 4673)
@@ -48,17 +48,28 @@
Initial Release: Monday, Oct 12 2011
Supported Presently
+Changelog for 1.3.16
+
+* Changes in <head> element for non-Latin characters, HTML invoices (Erik H)
+* Corrected untranslated string in Contact management screen (Chris T)
+* Corrected permissions issue creating pricelist (Chris T, 3513861)
+
Changelog for 1.3.15
+* Update WX POS (almost there) - readme and code (Andres B, item 3516949)
* Adding Perl-based database-setup and teardown scripts (Chris B)
* Corrected build issues w/Makefile due to inclusion of LedgerSMB.pm (Chris T)
* ledgersmb.conf.default : Update default PATH (H Sorli, item 3430019)
* Fixed imballanced payments when early payment discount processed (Chris T)
* Pricelists exportable as PDF and CSV (Chris T)
* Fixed payment/receipts shows with 0 due/payment list (Erik H, bug 3512555)
+* Correct POD spelling error in LedgerSMB/Form.pm (Robert C, bug 3472015)
+* Fixed Reconciliation.sql not loading (Erik H)
+Andres B is Andres Basile
Chris B is Chris Bennet
Chris T is Chris Travers
H Sorli is Havard Sorli
+Robert C is Robert James Clay
Changelog for 1.3.14
* Argentina (Spanish) translation and charts of accounts added. (Andres B)
Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/LedgerSMB/Form.pm 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1969,7 +1969,7 @@
=item $form->all_taxaccounts($myconfig, $dbh2[, $transdate]);
Get the tax rates and numbers for all the taxes in $form->{taxaccounts}. Does
-nothing if $form->{taxaccounts} is false. Taxes are listed as a space seperated
+nothing if $form->{taxaccounts} is false. Taxes are listed as a space separated
list of account numbers from the chart. The retrieved values are placed within
$form->{${accno}_rate} and $form->{${accno}_taxnumber}. If $transdate is set,
then only process taxes that were valid on $transdate.
@@ -2187,7 +2187,7 @@
accounts that have $module in their link field. The hash is keyed upon link
elements such as 'AP_amount' and 'AR_tax' and they refer to lists of hashes
containing accno and description for the appropriate accounts. If the key does
-not contain 'tax', the account number is appended to the space seperated list
+not contain 'tax', the account number is appended to the space separated list
$form->{accounts}. $module is typically 'AR' or 'AP' and is the base type of
the accounts looked up.
@@ -2754,7 +2754,7 @@
Clears out any old status entries for $form->{id} and saves new status entries.
Queued form names are extracted from $form->{queued}. Printed and emailed form
names are extracted from $form->{printed} and $form->{emailed}. The queued,
-printed, and emailed fields are space seperated lists.
+printed, and emailed fields are space separated lists.
=cut
@@ -2898,7 +2898,7 @@
Saves or deletes recurring transaction scheduling. $form->{id} is used to
determine the id used in the various recurring tables. A recurring transaction
schedule is deleted by having $form->{recurring} be false. For adding or
-updating a schedule, $form->{recurring} is a comma seperated field with partial
+updating a schedule, $form->{recurring} is a comma separated field with partial
subfield quoting of the form:
reference,startdate,repeat,unit,howmany,payment,print,email,message
@@ -2933,11 +2933,11 @@
=item print
-A colon seperated list of formname:format:printer triplets.
+A colon separated list of formname:format:printer triplets.
=item email
-A colon seperated list of formname:format pairs.
+A colon separated list of formname:format pairs.
=item message
Modified: trunk/LedgerSMB/IC.pm
===================================================================
--- trunk/LedgerSMB/IC.pm 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/LedgerSMB/IC.pm 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1241,7 +1241,7 @@
p.drawing, p.microfiche, p.assembly,
pg.partsgroup, a.invnumber, a.ordnumber,
a.quonumber, i.trans_id, ct.employee_id,
- CONCAT(e.first_name, ' ',e.last_name) AS employee, a.curr, a.till, p.notes
+ e.first_name \|\| ' ' \|\| e.last_name AS employee, a.curr, a.till, p.notes
$makemodelfld|;
if ( $form->{bought} ) {
@@ -1338,7 +1338,7 @@
p.drawing, p.microfiche, p.assembly,
pg.partsgroup, '' AS invnumber, a.ordnumber,
a.quonumber, i.trans_id, ct.employee_id,
- CONCAT(e.first_name, ' ',e.last_name) AS employee, a.curr, '0' AS till,
+ e.first_name \|\| ' ' \|\| e.last_name AS employee, a.curr, '0' AS till,
p.notes
$makemodelfld|;
@@ -1382,7 +1382,7 @@
pg.partsgroup, '' AS invnumber,
a.ordnumber, a.quonumber,
i.trans_id, ct.employee_id,
- CONCAT(e.first_name,' ',e.last_name) AS employee,
+ e.first_name \|\| ' ' \|\| e.last_name AS employee,
a.curr, '0' AS till, p.notes
$makemodelfld|;
@@ -1449,7 +1449,7 @@
p.drawing, p.microfiche, p.assembly,
pg.partsgroup, '' AS invnumber, a.ordnumber,
a.quonumber, i.trans_id, ct.employee_id,
- CONCAT(e.first_name,' ',e.last_name) AS employee, a.curr, '0' AS till, p.notes
+ e.first_name \|\| ' ' \|\| e.last_name AS employee, a.curr, '0' AS till, p.notes
$makemodelfld|;
if ( $form->{quoted} ) {
@@ -1493,7 +1493,7 @@
pg.partsgroup, '' AS invnumber,
a.ordnumber, a.quonumber,
i.trans_id, ct.employee_id,
- CONCAT(e.first_name,' ',e.last_name) AS employee,
+ e.first_name \|\| ' ' \|\| e.last_name AS employee,
a.curr, '0' AS till, p.notes
$makemodelfld|;
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4633
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4672
/branches/1.3/scripts/account.pl:3711-4368
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4633
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4672
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4633
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4672
/branches/1.3/scripts/customer.pl:4273-4287
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4633
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4672
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4633
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4672
/branches/1.3/scripts/file.pl:3711-4138
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4633
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4672
/branches/1.3/scripts/journal.pl:3711-4328
Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4633
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4672
/branches/1.3/scripts/login.pl:3711-4192
Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4633
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4672
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4633
/branches/1.3/scripts/payment.pl:3711-4617
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4672
/branches/1.3/scripts/payment.pl:3711-4617
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4633
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4672
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4633
/branches/1.3/scripts/setup.pl:3711-4550
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4672
/branches/1.3/scripts/setup.pl:3711-4550
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4633
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4672
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4633
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4672
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/LedgerSMB/Template/LaTeX.pm
===================================================================
--- trunk/LedgerSMB/Template/LaTeX.pm 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/LedgerSMB/Template/LaTeX.pm 2012-04-24 11:48:40 UTC (rev 4673)
@@ -103,13 +103,27 @@
return $vars;
}
+my %escapes = (
+ '&' => '\\&',
+ '$' => '\\$',
+ '\\' => '{\\textbackslash}',
+ '_' => '\\_',
+ '<' => '\\<',
+ '>' => '\\>',
+ '~' => '\\~',
+ '^' => '\\^',
+ '#' => '\\#',
+ '%' => '\\%',
+ '{' => '\\{',
+ '}' => '\\}',
+ );
# Breaking this off to be used separately.
sub escape {
my ($vars) = shift @_;
if (defined $vars){
- $vars =~ s/([&\$\\_<>~^#\%\{\}])/\\$1/g;
+ $vars =~ s/([&\$\\_<>~^#\%\{\}])/$escapes{$1}/g;
$vars =~ s/â/--/g;
$vars =~ s/[ââ]/---/g;
$vars =~ s/"(.*)"/``$1''/gs;
Modified: trunk/LedgerSMB/Template/TXT.pm
===================================================================
--- trunk/LedgerSMB/Template/TXT.pm 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/LedgerSMB/Template/TXT.pm 2012-04-24 11:48:40 UTC (rev 4673)
@@ -113,7 +113,7 @@
sub postprocess {
my ($parent) = shift;
if (!$parent->{rendered}){
- return $parent->{template} . '.' get_extension($parent);
+ return $parent->{template} . '.' . get_extension($parent);
}
$parent->{rendered} = "$parent->{outputfile}.". get_extension($parent) if $parent->{outputfile};
return $parent->{rendered};
Modified: trunk/UI/menu/expanding.html
===================================================================
--- trunk/UI/menu/expanding.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/UI/menu/expanding.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -39,7 +39,9 @@
<body class="menu">
+ <div style="text-align: center"><a target="_blank" href="http://ledgersmb.org/";>
<img class="cornderlogo" src="images/ledgersmb_small.png" width="100" height="50" border="1" alt="LedgerSMB" />
+ </a></div>
<div id="company_info"><?lsmb text("Logged into [_1]", company) ?></div>
<ul id="top_menu" class="menu_open">
<?lsmb old_level = 0 ?>
Modified: trunk/sql/modules/Reconciliation.sql
===================================================================
--- trunk/sql/modules/Reconciliation.sql 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/sql/modules/Reconciliation.sql 2012-04-24 11:48:40 UTC (rev 4673)
@@ -204,7 +204,7 @@
-- XXX Badly named, rename for 1.4. --CT
CREATE OR REPLACE FUNCTION reconciliation__new_report_id
-(in_chart_id int, in_total numeric, in_end_date date, in_recon_fx) returns INT as $$
+(in_chart_id int, in_total numeric, in_end_date date, in_recon_fx bool) returns INT as $$
INSERT INTO cr_report(chart_id, their_total, end_date, recon_fx)
values ($1, $2, $3, $4);
@@ -213,7 +213,7 @@
$$ language 'sql';
COMMENT ON FUNCTION reconciliation__new_report_id
-(in_chart_id int, in_total numeric, in_end_date date) IS
+(in_chart_id int, in_total numeric, in_end_date date, in_recon_fx bool) IS
$$ Inserts creates a new report and returns the id.$$;
create or replace function reconciliation__add_entry(
Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/sql/modules/Roles.sql 2012-04-24 11:48:40 UTC (rev 4673)
@@ -856,6 +856,9 @@
GRANT "lsmb_<?lsmb dbname ?>__file_read" TO "lsmb_<?lsmb dbname ?>__part_edit";
+GRANT ALL ON partscustomer_entry_id_seq
+TO "lsmb_<?lsmb dbname ?>__contact_edit", "lsmb_<?lsmb dbname ?>__part_edit";
+
GRANT SELECT ON assembly, orderitems, jcitems, invoice, business_unit_oitem
TO "lsmb_<?lsmb dbname ?>__part_edit";
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4633
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4672
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
Modified: trunk/templates/demo/ap_transaction.html
===================================================================
--- trunk/templates/demo/ap_transaction.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/ap_transaction.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('AP Transaction') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/ar_transaction.html
===================================================================
--- trunk/templates/demo/ar_transaction.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/ar_transaction.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('AR Transaction') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/bin_list.html
===================================================================
--- trunk/templates/demo/bin_list.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/bin_list.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Bin List') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/bin_list.tex
===================================================================
--- trunk/templates/demo/bin_list.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/bin_list.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -2,6 +2,7 @@
\documentclass{scrartcl}
\usepackage[utf8]{inputenc}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -100,11 +101,11 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>} &
\textbf{<?lsmb text('Serial Number') ?>} &
- & \textbf{<?lsmb text('Qty'} ?>& \textbf{<?lsmb text('Recd') ?>} &
+ & \textbf{<?lsmb text('Qty') ?>} & \textbf{<?lsmb text('Recd') ?>} &
& \textbf{<?lsmb text('Bin') ?>} \\
<?lsmb FOREACH number ?>
@@ -119,7 +120,7 @@
<?lsmb unit.${lc} ?> &
<?lsmb bin.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\rule{\textwidth}{2pt}
Modified: trunk/templates/demo/packing_list.html
===================================================================
--- trunk/templates/demo/packing_list.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/packing_list.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Packing List') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/packing_list.tex
===================================================================
--- trunk/templates/demo/packing_list.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/packing_list.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -2,6 +2,7 @@
\documentclass{scrartcl}
\usepackage[utf8]{inputenc}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -97,7 +98,7 @@
& <?lsmb shippingdate ?>
<?lsmb ELSE ?>
& <?lsmb transdate ?>
- <?lsmb END shippingdate ?>
+ <?lsmb END ?>
& <?lsmb employee ?>
<?lsmb IF warehouse ?>
& <?lsmb warehouse ?>
@@ -108,7 +109,7 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>}
& \textbf{<?lsmb text('Serial Number') ?>} &
@@ -125,7 +126,7 @@
<?lsmb ship.${lc} ?> &
<?lsmb unit.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\parbox{\textwidth}{
Modified: trunk/templates/demo/pick_list.html
===================================================================
--- trunk/templates/demo/pick_list.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/pick_list.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Pick List') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/pick_list.tex
===================================================================
--- trunk/templates/demo/pick_list.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/pick_list.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -2,6 +2,7 @@
\documentclass{scrartcl}
\usepackage[utf8]{inputenc}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -94,7 +95,7 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>} &
\textbf{<?lsmb text('Qty') ?>} & \textbf{<?lsmb text('Ship') ?>} &
@@ -107,7 +108,7 @@
<?lsmb qty.${lc} ?> & [\hspace{1cm}] &
<?lsmb unit.${lc} ?> & <?lsmb bin.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\parbox{\textwidth}{
Modified: trunk/templates/demo/purchase_order.html
===================================================================
--- trunk/templates/demo/purchase_order.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/purchase_order.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Purchase Order') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/purchase_order.tex
===================================================================
--- trunk/templates/demo/purchase_order.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/purchase_order.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -102,7 +102,7 @@
\vspace{1cm}
\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
- \textbf{<?lsmb text('Order #') ?>} & \textbf{text('Date') ?>}
+ \textbf{<?lsmb text('Order #') ?>} & \textbf{<?lsmb text('Date') ?>}
& \textbf{<?lsmb text('Required by') ?>} & \textbf{<?lsmb text('Contact') ?>}
& \textbf{<?lsmb text('Shipping Point') ?>}
& \textbf{<?lsmb text('Ship via') ?>} \\ [0.5ex]
Modified: trunk/templates/demo/request_quotation.html
===================================================================
--- trunk/templates/demo/request_quotation.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/request_quotation.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Request for Quotation') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/sales_order.html
===================================================================
--- trunk/templates/demo/sales_order.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/sales_order.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Sales Order') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/sales_quotation.html
===================================================================
--- trunk/templates/demo/sales_quotation.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/sales_quotation.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Quotation') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/statement.html
===================================================================
--- trunk/templates/demo/statement.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/statement.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Statement') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<?lsmb FOREACH customer IN data ?>
Modified: trunk/templates/demo/timecard.html
===================================================================
--- trunk/templates/demo/timecard.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/timecard.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Time Card') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/work_order.html
===================================================================
--- trunk/templates/demo/work_order.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/work_order.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Work Order') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/demo/work_order.tex
===================================================================
--- trunk/templates/demo/work_order.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/demo/work_order.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -2,6 +2,7 @@
\documentclass{scrartcl}
\usepackage[utf8]{inputenc}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -119,10 +120,10 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>} & \textbf{<?lsmb text('Qty') ?>} &
- & \textbf{<?lsmb text('Serial Number')} \\
+ & \textbf{<?lsmb text('Serial Number') ?>} \\
<?lsmb FOREACH number ?>
<?lsmb lc = loop.count - 1 ?>
<?lsmb runningnumber.${lc} ?> &
@@ -132,7 +133,7 @@
<?lsmb unit.${lc} ?> &
<?lsmb serialnumber.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\parbox{\textwidth}{
Modified: trunk/templates/xedemo/ap_transaction.html
===================================================================
--- trunk/templates/xedemo/ap_transaction.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/ap_transaction.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('AP Transaction') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/ar_transaction.html
===================================================================
--- trunk/templates/xedemo/ar_transaction.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/ar_transaction.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('AR Transaction') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/bin_list.html
===================================================================
--- trunk/templates/xedemo/bin_list.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/bin_list.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Bin List') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/bin_list.tex
===================================================================
--- trunk/templates/xedemo/bin_list.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/bin_list.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -3,6 +3,7 @@
\usepackage{xltxtra}
\setmainfont{Verdana}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -99,11 +100,11 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>} &
\textbf{<?lsmb text('Serial Number') ?>} &
- & \textbf{<?lsmb text('Qty'} ?>& \textbf{<?lsmb text('Recd') ?>} &
+ & \textbf{<?lsmb text('Qty') ?>} & \textbf{<?lsmb text('Recd') ?>} &
& \textbf{<?lsmb text('Bin') ?>} \\
<?lsmb FOREACH number ?>
@@ -118,7 +119,7 @@
<?lsmb unit.${lc} ?> &
<?lsmb bin.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\rule{\textwidth}{2pt}
Modified: trunk/templates/xedemo/packing_list.html
===================================================================
--- trunk/templates/xedemo/packing_list.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/packing_list.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Packing List') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/packing_list.tex
===================================================================
--- trunk/templates/xedemo/packing_list.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/packing_list.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -3,6 +3,7 @@
\usepackage{xltxtra}
\setmainfont{Verdana}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -96,7 +97,7 @@
& <?lsmb shippingdate ?>
<?lsmb ELSE ?>
& <?lsmb transdate ?>
- <?lsmb END shippingdate ?>
+ <?lsmb END ?>
& <?lsmb employee ?>
<?lsmb IF warehouse ?>
& <?lsmb warehouse ?>
@@ -107,7 +108,7 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>}
& \textbf{<?lsmb text('Serial Number') ?>} &
@@ -124,7 +125,7 @@
<?lsmb ship.${lc} ?> &
<?lsmb unit.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\parbox{\textwidth}{
Modified: trunk/templates/xedemo/pick_list.html
===================================================================
--- trunk/templates/xedemo/pick_list.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/pick_list.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Pick List') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/pick_list.tex
===================================================================
--- trunk/templates/xedemo/pick_list.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/pick_list.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -3,6 +3,7 @@
\usepackage{xltxtra}
\setmainfont{Verdana}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -93,7 +94,7 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>} &
\textbf{<?lsmb text('Qty') ?>} & \textbf{<?lsmb text('Ship') ?>} &
@@ -106,7 +107,7 @@
<?lsmb qty.${lc} ?> & [\hspace{1cm}] &
<?lsmb unit.${lc} ?> & <?lsmb bin.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\parbox{\textwidth}{
Modified: trunk/templates/xedemo/purchase_order.html
===================================================================
--- trunk/templates/xedemo/purchase_order.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/purchase_order.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Purchase Order') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/purchase_order.tex
===================================================================
--- trunk/templates/xedemo/purchase_order.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/purchase_order.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -101,7 +101,7 @@
\vspace{1cm}
\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
- \textbf{<?lsmb text('Order #') ?>} & \textbf{text('Date') ?>}
+ \textbf{<?lsmb text('Order #') ?>} & \textbf{<?lsmb text('Date') ?>}
& \textbf{<?lsmb text('Required by') ?>} & \textbf{<?lsmb text('Contact') ?>}
& \textbf{<?lsmb text('Shipping Point') ?>}
& \textbf{<?lsmb text('Ship via') ?>} \\ [0.5ex]
Modified: trunk/templates/xedemo/request_quotation.html
===================================================================
--- trunk/templates/xedemo/request_quotation.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/request_quotation.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Request for Quotation') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/sales_order.html
===================================================================
--- trunk/templates/xedemo/sales_order.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/sales_order.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Sales Order') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/xedemo/sales_quotation.html
===================================================================
--- trunk/templates/xedemo/sales_quotation.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/sales_quotation.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Quotation') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/statement.html
===================================================================
--- trunk/templates/xedemo/statement.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/statement.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Statement') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
Modified: trunk/templates/xedemo/timecard.html
===================================================================
--- trunk/templates/xedemo/timecard.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/timecard.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,3 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Time Card') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/xedemo/work_order.html
===================================================================
--- trunk/templates/xedemo/work_order.html 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/work_order.html 2012-04-24 11:48:40 UTC (rev 4673)
@@ -1,4 +1,9 @@
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+ <title><?lsmb text('Work Order') ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
<body bgcolor=ffffff>
<table width="100%">
Modified: trunk/templates/xedemo/work_order.tex
===================================================================
--- trunk/templates/xedemo/work_order.tex 2012-04-24 10:27:44 UTC (rev 4672)
+++ trunk/templates/xedemo/work_order.tex 2012-04-24 11:48:40 UTC (rev 4673)
@@ -3,6 +3,7 @@
\usepackage{xltxtra}
\setmainfont{Verdana}
\usepackage{tabularx}
+\usepackage{longtable}
\usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
\usepackage{graphicx}
@@ -118,10 +119,10 @@
\vspace{1cm}
..hidden..@{}}
..hidden..@{}}
\textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>}
& \textbf{<?lsmb text('Description') ?>} & \textbf{<?lsmb text('Qty') ?>} &
- & \textbf{<?lsmb text('Serial Number')} \\
+ & \textbf{<?lsmb text('Serial Number') ?>} \\
<?lsmb FOREACH number ?>
<?lsmb lc = loop.count - 1 ?>
<?lsmb runningnumber.${lc} ?> &
@@ -131,7 +132,7 @@
<?lsmb unit.${lc} ?> &
<?lsmb serialnumber.${lc} ?> \\
<?lsmb END ?>
-\end{tabularx}
+\end{longtable}
\parbox{\textwidth}{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.