diff -Nru sql-ledger-2.8.32/bin/lynx/am.pl sql-ledger-2.8.33/bin/lynx/am.pl --- sql-ledger-2.8.32/bin/lynx/am.pl 2010-09-27 23:29:05.000000000 +0000 +++ sql-ledger-2.8.33/bin/lynx/am.pl 2010-11-24 02:50:35.000000000 +0000 @@ -2208,7 +2208,7 @@ |; - $form->{optional} = "company address tel fax companyemail companywebsite yearend weightunit businessnumber closedto revtrans audittrail method cdt namesbynumber typeofcontact"; + $form->{optional} = "companyemail companywebsite company address tel fax yearend weightunit businessnumber closedto revtrans audittrail method cdt namesbynumber typeofcontact"; $form->hide_form(qw(optional closedto revtrans audittrail path login)); diff -Nru sql-ledger-2.8.32/bin/lynx/arapprn.pl sql-ledger-2.8.33/bin/lynx/arapprn.pl --- sql-ledger-2.8.32/bin/lynx/arapprn.pl 2010-10-12 22:09:07.000000000 +0000 +++ sql-ledger-2.8.33/bin/lynx/arapprn.pl 2010-11-24 02:51:21.000000000 +0000 @@ -149,7 +149,7 @@ for (qw(employee paymentmethod)) { ($form->{$_}, $form->{"${_}_id"}) = split /--/, $form->{$_} }; - push @a, qw(employee paymentmethod notes intnotes company address tel fax businessnumber); + push @a, qw(employee paymentmethod notes intnotes companyemail companywebsite company address tel fax businessnumber); $form->format_string(@a); @@ -388,7 +388,7 @@ @a = qw(employee paymentmethod invnumber transdate duedate notes intnotes ndcn rvc); - push @a, qw(company address tel fax businessnumber text_amount text_decimal text_out_decimal text_out_amount); + push @a, qw(companyemail companywebsite company address tel fax businessnumber text_amount text_decimal text_out_decimal text_out_amount); $form->format_string(@a); diff -Nru sql-ledger-2.8.32/bin/lynx/cp.pl sql-ledger-2.8.33/bin/lynx/cp.pl --- sql-ledger-2.8.32/bin/lynx/cp.pl 2008-02-18 23:13:04.000000000 +0000 +++ sql-ledger-2.8.33/bin/lynx/cp.pl 2010-11-24 02:51:29.000000000 +0000 @@ -2010,7 +2010,7 @@ AA->company_details(\%myconfig, \%$form); - $form->format_string(qw(company address)); + $form->format_string(qw(companyemail companywebsite company address)); $form->{templates} = "$myconfig{templates}"; $form->{IN} = "$form->{formname}.tex"; diff -Nru sql-ledger-2.8.32/bin/lynx/io.pl sql-ledger-2.8.33/bin/lynx/io.pl --- sql-ledger-2.8.32/bin/lynx/io.pl 2009-07-16 19:03:45.000000000 +0000 +++ sql-ledger-2.8.33/bin/lynx/io.pl 2010-12-12 17:21:52.000000000 +0000 @@ -1103,8 +1103,7 @@ for $i (1 .. $form->{rowcount}) { - $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100); - for (qw(netweight grossweight volume)) { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } + for (qw(netweight grossweight volume discount)) { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); $dec = length $dec; @@ -1619,7 +1618,7 @@ for (qw(name email)) { $form->{"user$_"} = $myconfig{$_} } - push @a, qw(company address tel fax businessnumber username useremail dcn rvc); + push @a, qw(companyemail companywebsite company address tel fax businessnumber username useremail dcn rvc); for (qw(notes intnotes)) { $form->{$_} =~ s/^\s+//g } @@ -1658,7 +1657,7 @@ action => 'printed', id => $form->{id} ); - if (defined %$old_form) { + if ($old_form) { $old_form->{printed} = $form->{printed}; $old_form->{audittrail} .= $form->audittrail("", \%myconfig, \%audittrail); } @@ -1691,7 +1690,7 @@ action => 'emailed', id => $form->{id} ); - if (defined %$old_form) { + if ($old_form) { $old_form->{intnotes} = qq|$old_form->{intnotes}\n\n| if $old_form->{intnotes}; $old_form->{intnotes} .= qq|[email]\n| .$locale->text('Date').qq|: $now\n| @@ -1743,7 +1742,7 @@ action => 'queued', id => $form->{id} ); - if (defined %$old_form) { + if ($old_form) { $old_form->{queued} = $form->{queued}; $old_form->{audittrail} .= $form->audittrail("", \%myconfig, \%audittrail); } @@ -1760,7 +1759,7 @@ # if we got back here restore the previous form - if (defined %$old_form) { + if ($old_form) { $old_form->{"${inv}number"} = $form->{"${inv}number"}; $old_form->{dcn} = $form->{dcn}; diff -Nru sql-ledger-2.8.32/bin/lynx/jc.pl sql-ledger-2.8.33/bin/lynx/jc.pl --- sql-ledger-2.8.32/bin/lynx/jc.pl 2010-05-12 18:04:42.000000000 +0000 +++ sql-ledger-2.8.33/bin/lynx/jc.pl 2010-11-27 18:00:09.000000000 +0000 @@ -1775,7 +1775,7 @@ @a = (); push @a, qw(partnumber description projectnumber projectdescription); - push @a, qw(company address tel fax businessnumber username useremail); + push @a, qw(companyemail companywebsite company address tel fax businessnumber username useremail); $form->format_string(@a); @@ -1846,7 +1846,7 @@ $form->parse_template(\%myconfig, $userspath); - if (defined %$old_form) { + if ($old_form) { for (keys %$old_form) { $form->{$_} = $old_form->{$_} } for (qw(printed queued audittrail)) { $form->{$_} = $status{$_} } diff -Nru sql-ledger-2.8.32/bin/lynx/pos.pl sql-ledger-2.8.33/bin/lynx/pos.pl --- sql-ledger-2.8.32/bin/lynx/pos.pl 2008-11-30 16:32:56.000000000 +0000 +++ sql-ledger-2.8.33/bin/lynx/pos.pl 2010-11-24 02:52:03.000000000 +0000 @@ -737,7 +737,7 @@ $form->{username} = $myconfig{name}; - push @a, qw(company address tel fax businessnumber username); + push @a, qw(companyemail companywebsite company address tel fax businessnumber username); $form->format_string(@a); $form->{templates} = "$myconfig{templates}"; diff -Nru sql-ledger-2.8.32/bin/lynx/rp.pl sql-ledger-2.8.33/bin/lynx/rp.pl --- sql-ledger-2.8.32/bin/lynx/rp.pl 2010-05-04 23:02:30.000000000 +0000 +++ sql-ledger-2.8.33/bin/lynx/rp.pl 2010-11-24 02:48:18.000000000 +0000 @@ -963,7 +963,7 @@ } # setup variables for the form - $form->format_string(qw(company address businessnumber)); + $form->format_string(qw(companyemail companywebsite company address businessnumber)); $form->{address} =~ s/\n/
/g; $form->{templates} = $myconfig{templates}; @@ -999,7 +999,7 @@ $form->{IN} = "balance_sheet.html"; # setup company variables for the form - $form->format_string(qw(company address businessnumber)); + $form->format_string(qw(companyemail companywebsite company address businessnumber)); $form->{address} =~ s/\n/
/g; $form->{templates} = $myconfig{templates}; @@ -2494,7 +2494,7 @@ for (qw(name email)) { $form->{"user$_"} = $myconfig{$_} } # setup variables for the form - $form->format_string(qw(company address businessnumber username useremail tel fax)); + $form->format_string(qw(companyemail companywebsite company address businessnumber username useremail tel fax)); @a = qw(name address1 address2 city state zipcode country contact typeofcontact salutation firstname lastname); push @a, "$form->{vc}number", "$form->{vc}phone", "$form->{vc}fax", "$form->{vc}taxnumber"; @@ -2553,7 +2553,7 @@ for (qw(name email)) { $form->{"user$_"} = $myconfig{$_} } # setup variables for the form - $form->format_string(qw(company address businessnumber username useremail tel fax companyemail companywebsite)); + $form->format_string(qw(companyemail companywebsite company address businessnumber username useremail tel fax)); @a = qw(name address1 address2 city state zipcode country contact typeofcontact salutation firstname lastname); push @a, "$form->{vc}number", "$form->{vc}phone", "$form->{vc}fax", "$form->{vc}taxnumber"; diff -Nru sql-ledger-2.8.32/bin/mozilla/am.pl sql-ledger-2.8.33/bin/mozilla/am.pl --- sql-ledger-2.8.32/bin/mozilla/am.pl 2010-09-27 23:29:05.000000000 +0000 +++ sql-ledger-2.8.33/bin/mozilla/am.pl 2010-11-24 02:50:35.000000000 +0000 @@ -2208,7 +2208,7 @@ |; - $form->{optional} = "company address tel fax companyemail companywebsite yearend weightunit businessnumber closedto revtrans audittrail method cdt namesbynumber typeofcontact"; + $form->{optional} = "companyemail companywebsite company address tel fax yearend weightunit businessnumber closedto revtrans audittrail method cdt namesbynumber typeofcontact"; $form->hide_form(qw(optional closedto revtrans audittrail path login)); diff -Nru sql-ledger-2.8.32/bin/mozilla/arapprn.pl sql-ledger-2.8.33/bin/mozilla/arapprn.pl --- sql-ledger-2.8.32/bin/mozilla/arapprn.pl 2010-10-12 22:09:07.000000000 +0000 +++ sql-ledger-2.8.33/bin/mozilla/arapprn.pl 2010-11-24 02:51:21.000000000 +0000 @@ -149,7 +149,7 @@ for (qw(employee paymentmethod)) { ($form->{$_}, $form->{"${_}_id"}) = split /--/, $form->{$_} }; - push @a, qw(employee paymentmethod notes intnotes company address tel fax businessnumber); + push @a, qw(employee paymentmethod notes intnotes companyemail companywebsite company address tel fax businessnumber); $form->format_string(@a); @@ -388,7 +388,7 @@ @a = qw(employee paymentmethod invnumber transdate duedate notes intnotes ndcn rvc); - push @a, qw(company address tel fax businessnumber text_amount text_decimal text_out_decimal text_out_amount); + push @a, qw(companyemail companywebsite company address tel fax businessnumber text_amount text_decimal text_out_decimal text_out_amount); $form->format_string(@a); diff -Nru sql-ledger-2.8.32/bin/mozilla/cp.pl sql-ledger-2.8.33/bin/mozilla/cp.pl --- sql-ledger-2.8.32/bin/mozilla/cp.pl 2008-02-18 23:13:04.000000000 +0000 +++ sql-ledger-2.8.33/bin/mozilla/cp.pl 2010-11-24 02:51:29.000000000 +0000 @@ -2010,7 +2010,7 @@ AA->company_details(\%myconfig, \%$form); - $form->format_string(qw(company address)); + $form->format_string(qw(companyemail companywebsite company address)); $form->{templates} = "$myconfig{templates}"; $form->{IN} = "$form->{formname}.tex"; diff -Nru sql-ledger-2.8.32/bin/mozilla/io.pl sql-ledger-2.8.33/bin/mozilla/io.pl --- sql-ledger-2.8.32/bin/mozilla/io.pl 2009-07-16 19:03:45.000000000 +0000 +++ sql-ledger-2.8.33/bin/mozilla/io.pl 2010-12-12 17:21:52.000000000 +0000 @@ -1103,8 +1103,7 @@ for $i (1 .. $form->{rowcount}) { - $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100); - for (qw(netweight grossweight volume)) { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } + for (qw(netweight grossweight volume discount)) { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); $dec = length $dec; @@ -1619,7 +1618,7 @@ for (qw(name email)) { $form->{"user$_"} = $myconfig{$_} } - push @a, qw(company address tel fax businessnumber username useremail dcn rvc); + push @a, qw(companyemail companywebsite company address tel fax businessnumber username useremail dcn rvc); for (qw(notes intnotes)) { $form->{$_} =~ s/^\s+//g } @@ -1658,7 +1657,7 @@ action => 'printed', id => $form->{id} ); - if (defined %$old_form) { + if ($old_form) { $old_form->{printed} = $form->{printed}; $old_form->{audittrail} .= $form->audittrail("", \%myconfig, \%audittrail); } @@ -1691,7 +1690,7 @@ action => 'emailed', id => $form->{id} ); - if (defined %$old_form) { + if ($old_form) { $old_form->{intnotes} = qq|$old_form->{intnotes}\n\n| if $old_form->{intnotes}; $old_form->{intnotes} .= qq|[email]\n| .$locale->text('Date').qq|: $now\n| @@ -1743,7 +1742,7 @@ action => 'queued', id => $form->{id} ); - if (defined %$old_form) { + if ($old_form) { $old_form->{queued} = $form->{queued}; $old_form->{audittrail} .= $form->audittrail("", \%myconfig, \%audittrail); } @@ -1760,7 +1759,7 @@ # if we got back here restore the previous form - if (defined %$old_form) { + if ($old_form) { $old_form->{"${inv}number"} = $form->{"${inv}number"}; $old_form->{dcn} = $form->{dcn}; diff -Nru sql-ledger-2.8.32/bin/mozilla/jc.pl sql-ledger-2.8.33/bin/mozilla/jc.pl --- sql-ledger-2.8.32/bin/mozilla/jc.pl 2010-05-12 18:04:42.000000000 +0000 +++ sql-ledger-2.8.33/bin/mozilla/jc.pl 2010-11-27 18:00:09.000000000 +0000 @@ -1775,7 +1775,7 @@ @a = (); push @a, qw(partnumber description projectnumber projectdescription); - push @a, qw(company address tel fax businessnumber username useremail); + push @a, qw(companyemail companywebsite company address tel fax businessnumber username useremail); $form->format_string(@a); @@ -1846,7 +1846,7 @@ $form->parse_template(\%myconfig, $userspath); - if (defined %$old_form) { + if ($old_form) { for (keys %$old_form) { $form->{$_} = $old_form->{$_} } for (qw(printed queued audittrail)) { $form->{$_} = $status{$_} } diff -Nru sql-ledger-2.8.32/bin/mozilla/pos.pl sql-ledger-2.8.33/bin/mozilla/pos.pl --- sql-ledger-2.8.32/bin/mozilla/pos.pl 2008-11-30 16:32:56.000000000 +0000 +++ sql-ledger-2.8.33/bin/mozilla/pos.pl 2010-11-24 02:52:03.000000000 +0000 @@ -737,7 +737,7 @@ $form->{username} = $myconfig{name}; - push @a, qw(company address tel fax businessnumber username); + push @a, qw(companyemail companywebsite company address tel fax businessnumber username); $form->format_string(@a); $form->{templates} = "$myconfig{templates}"; diff -Nru sql-ledger-2.8.32/bin/mozilla/rp.pl sql-ledger-2.8.33/bin/mozilla/rp.pl --- sql-ledger-2.8.32/bin/mozilla/rp.pl 2010-05-04 23:02:30.000000000 +0000 +++ sql-ledger-2.8.33/bin/mozilla/rp.pl 2010-11-24 02:48:18.000000000 +0000 @@ -963,7 +963,7 @@ } # setup variables for the form - $form->format_string(qw(company address businessnumber)); + $form->format_string(qw(companyemail companywebsite company address businessnumber)); $form->{address} =~ s/\n/
/g; $form->{templates} = $myconfig{templates}; @@ -999,7 +999,7 @@ $form->{IN} = "balance_sheet.html"; # setup company variables for the form - $form->format_string(qw(company address businessnumber)); + $form->format_string(qw(companyemail companywebsite company address businessnumber)); $form->{address} =~ s/\n/
/g; $form->{templates} = $myconfig{templates}; @@ -2494,7 +2494,7 @@ for (qw(name email)) { $form->{"user$_"} = $myconfig{$_} } # setup variables for the form - $form->format_string(qw(company address businessnumber username useremail tel fax)); + $form->format_string(qw(companyemail companywebsite company address businessnumber username useremail tel fax)); @a = qw(name address1 address2 city state zipcode country contact typeofcontact salutation firstname lastname); push @a, "$form->{vc}number", "$form->{vc}phone", "$form->{vc}fax", "$form->{vc}taxnumber"; @@ -2553,7 +2553,7 @@ for (qw(name email)) { $form->{"user$_"} = $myconfig{$_} } # setup variables for the form - $form->format_string(qw(company address businessnumber username useremail tel fax companyemail companywebsite)); + $form->format_string(qw(companyemail companywebsite company address businessnumber username useremail tel fax)); @a = qw(name address1 address2 city state zipcode country contact typeofcontact salutation firstname lastname); push @a, "$form->{vc}number", "$form->{vc}phone", "$form->{vc}fax", "$form->{vc}taxnumber"; diff -Nru sql-ledger-2.8.32/debian/changelog sql-ledger-2.8.33/debian/changelog --- sql-ledger-2.8.32/debian/changelog 2010-11-29 23:09:44.000000000 +0000 +++ sql-ledger-2.8.33/debian/changelog 2011-02-02 17:08:24.000000000 +0000 @@ -1,3 +1,12 @@ +sql-ledger (2.8.33-1) unstable; urgency=low + + * New upstream release. + - fixed discount formatting error when converting quotation to order + * Drop Petter Reinholdtsen from Uploaders on his request. + * Drop Gerardo Reynoso from Uploaders as he hasn't responded to my mails. + + -- Raphaël Hertzog Wed, 02 Feb 2011 18:08:20 +0100 + sql-ledger (2.8.32-1) unstable; urgency=low * New upstream release. diff -Nru sql-ledger-2.8.32/debian/control sql-ledger-2.8.33/debian/control --- sql-ledger-2.8.32/debian/control 2010-10-20 20:57:19.000000000 +0000 +++ sql-ledger-2.8.33/debian/control 2011-02-02 17:07:55.000000000 +0000 @@ -2,7 +2,6 @@ Section: web Priority: optional Maintainer: Raphaël Hertzog -Uploaders: Petter Reinholdtsen , Gerardo Reynoso Build-Depends: debhelper (>= 7.0.50~), recode Homepage: http://www.sql-ledger.com Vcs-Svn: svn://svn.debian.org/pkg-sql-ledger/trunk diff -Nru sql-ledger-2.8.32/SL/Form.pm sql-ledger-2.8.33/SL/Form.pm --- sql-ledger-2.8.32/SL/Form.pm 2010-11-22 22:53:53.000000000 +0000 +++ sql-ledger-2.8.33/SL/Form.pm 2010-11-29 23:51:35.000000000 +0000 @@ -163,17 +163,17 @@ for (@a) { $var = $_ = $self->quote($_); - if (defined $rev) { + if ($rev ne "") { $_ =~ s/--.*//g; $var =~ s/.*--//g; } - if (defined $removeid) { + if ($removeid ne "") { $var =~ s/--.*//g; } $str .= qq|quote($selected); + $str .= qq| selected| if (($_ ne "") && ($_ eq $self->quote($selected))); $str .= qq|>$var\n|; } @@ -663,7 +663,7 @@ # but only if there was a <%pagebreak ...%> block before if ($var eq 'number' || $var eq 'part' || $var eq 'service') { - if ($chars_per_line && defined $self->{$var}) { + if ($chars_per_line && ($self->{$var} ne "")) { my $line; my $lines = 0; my $item = $self->{description}[$j]; @@ -3637,7 +3637,7 @@ $mm = substr("0$mm", -2); $longdate = "$dd$spc$mm$spc$yy"; - if (defined $longformat) { + if ($longformat ne "") { $longdate = "$dd"; $longdate .= ($spc eq '.') ? ". " : " "; $longdate .= &text($self, $self->{$longmonth}[--$mm])." $yy"; @@ -3648,7 +3648,7 @@ $mm = substr("0$mm", -2); $longdate = "$yy$spc$mm$spc$dd"; - if (defined $longformat) { + if ($longformat ne "") { $longdate = &text($self, $self->{$longmonth}[--$mm])." $dd $yy"; } } else { @@ -3657,7 +3657,7 @@ $mm = substr("0$mm", -2); $longdate = "$mm$spc$dd$spc$yy"; - if (defined $longformat) { + if ($longformat ne "") { $longdate = &text($self, $self->{$longmonth}[--$mm])." $dd $yy"; } } diff -Nru sql-ledger-2.8.32/SL/IM.pm sql-ledger-2.8.33/SL/IM.pm --- sql-ledger-2.8.32/SL/IM.pm 2010-09-15 15:58:45.000000000 +0000 +++ sql-ledger-2.8.33/SL/IM.pm 2010-11-27 17:58:35.000000000 +0000 @@ -1015,7 +1015,7 @@ if ($#dl) { $i++; for (keys %{$form->{$form->{type}}}) { - $form->{"${_}_$i"} = $dl[$form->{$form->{type}}->{$_}{ndx}] if defined $form->{$form->{type}}->{$_}{ndx}; + $form->{"${_}_$i"} = $dl[$form->{$form->{type}}->{$_}{ndx}] if $form->{$form->{type}}->{$_}{ndx} >= 0; } if ($sameorder ne qq|$dl[$form->{$form->{type}}->{ordnumber}{ndx}]$dl[$form->{$form->{type}}->{"$form->{vc}number"}{ndx}]|) { diff -Nru sql-ledger-2.8.32/templates/Default-invoice.tex sql-ledger-2.8.33/templates/Default-invoice.tex --- sql-ledger-2.8.32/templates/Default-invoice.tex 2006-03-27 19:58:53.000000000 +0000 +++ sql-ledger-2.8.33/templates/Default-invoice.tex 2010-12-10 16:29:34.000000000 +0000 @@ -16,7 +16,7 @@ \parbox{\textwidth}{ \tiny \rule[1.5em]{\textwidth}{0.5pt} -Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will acrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge. +Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will accrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge. A return authorization must be obtained from <%company%> before goods are returned. Returns must be shipped prepaid and properly insured. <%company%> will not be responsible for damages during transit. } diff -Nru sql-ledger-2.8.32/templates/Estonian-invoice.tex sql-ledger-2.8.33/templates/Estonian-invoice.tex --- sql-ledger-2.8.32/templates/Estonian-invoice.tex 2006-03-27 19:58:54.000000000 +0000 +++ sql-ledger-2.8.33/templates/Estonian-invoice.tex 2010-12-10 16:31:09.000000000 +0000 @@ -16,7 +16,7 @@ \parbox{\textwidth}{ \tiny \rule[1.5em]{\textwidth}{0.5pt} -Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will acrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge. +Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will accrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge. A return authorization must be obtained from <%company%> before goods are returned. Returns must be shipped prepaid and properly insured. <%company%> will not be responsible for damages during transit. } diff -Nru sql-ledger-2.8.32/templates/Estonian_UTF8-invoice.tex sql-ledger-2.8.33/templates/Estonian_UTF8-invoice.tex --- sql-ledger-2.8.32/templates/Estonian_UTF8-invoice.tex 2006-03-27 19:58:54.000000000 +0000 +++ sql-ledger-2.8.33/templates/Estonian_UTF8-invoice.tex 2010-12-10 16:31:14.000000000 +0000 @@ -16,7 +16,7 @@ \parbox{\textwidth}{ \tiny \rule[1.5em]{\textwidth}{0.5pt} -Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will acrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge. +Payment due NET <%terms%> Days from date of Invoice. Interest on overdue amounts will accrue at the rate of 12\% per annum starting from <%duedate%> until paid in full. Items returned are subject to a 10\% restocking charge. A return authorization must be obtained from <%company%> before goods are returned. Returns must be shipped prepaid and properly insured. <%company%> will not be responsible for damages during transit. } diff -Nru sql-ledger-2.8.32/templates/French-purchase_order.html sql-ledger-2.8.33/templates/French-purchase_order.html --- sql-ledger-2.8.32/templates/French-purchase_order.html 2004-02-25 19:49:12.000000000 +0000 +++ sql-ledger-2.8.33/templates/French-purchase_order.html 2010-12-10 16:31:27.000000000 +0000 @@ -183,7 +183,7 @@