[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4936] trunk
- Subject: SF.net SVN: ledger-smb:[4936] trunk
- From: ..hidden..
- Date: Thu, 21 Jun 2012 06:34:05 +0000
Revision: 4936
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4936&view=rev
Author: einhverfr
Date: 2012-06-21 06:34:05 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/Template/CSV.pm
trunk/locale/po/es_AR.po
trunk/templates/demo/ap_transaction.html
trunk/templates/demo/ap_transaction.tex
trunk/templates/demo/ar_transaction.html
trunk/templates/demo/ar_transaction.tex
trunk/templates/demo/invoice.html
trunk/templates/demo/invoice.tex
trunk/templates/demo/packing_list.html
trunk/templates/demo/packing_list.tex
trunk/templates/demo/purchase_order.html
trunk/templates/demo/purchase_order.tex
trunk/templates/demo/request_quotation.html
trunk/templates/demo/request_quotation.tex
trunk/templates/demo/sales_order.html
trunk/templates/demo/sales_order.tex
trunk/templates/demo/sales_quotation.html
trunk/templates/demo/sales_quotation.tex
trunk/templates/demo/timecard.html
trunk/templates/demo/timecard.tex
trunk/templates/demo/work_order.html
trunk/templates/demo/work_order.tex
trunk/templates/xedemo/ap_transaction.html
trunk/templates/xedemo/ap_transaction.tex
trunk/templates/xedemo/ar_transaction.html
trunk/templates/xedemo/ar_transaction.tex
trunk/templates/xedemo/bin_list.html
trunk/templates/xedemo/invoice.html
trunk/templates/xedemo/invoice.tex
trunk/templates/xedemo/packing_list.html
trunk/templates/xedemo/packing_list.tex
trunk/templates/xedemo/pick_list.html
trunk/templates/xedemo/purchase_order.html
trunk/templates/xedemo/purchase_order.tex
trunk/templates/xedemo/request_quotation.html
trunk/templates/xedemo/request_quotation.tex
trunk/templates/xedemo/sales_order.html
trunk/templates/xedemo/sales_order.tex
trunk/templates/xedemo/sales_quotation.html
trunk/templates/xedemo/sales_quotation.tex
trunk/templates/xedemo/statement.html
trunk/templates/xedemo/timecard.html
trunk/templates/xedemo/timecard.tex
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/contact.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/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4904
+ /branches/1.3:3711-4935
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/Changelog 2012-06-21 06:34:05 UTC (rev 4936)
@@ -58,6 +58,10 @@
Initial Release: Monday, Oct 12 2011
Supported Presently
+Changelog for 1.3.20
+* Fixes for es_AR translation, duplicate keys removed (Andres B)
+* Demo templates provide better handling of paragraph breaks in notes (Chris T)
+
Changelog for 1.3.19
* New link for customer/vendor when not a dropdown (Chris T)
* Removed file debugging code from file.pl (Chris T)
@@ -73,6 +77,7 @@
* Fixed encoding of attachment retrieval (Chris T h/t Erik H)
* Fixed missing grant on partsvendor_entry_id_seq (Chris T, h/t Brian W)
* Fixed voiding invoice duplicates payment (Chris T h/t John L)
+* Fixed CSV exports not having any data (Chris T h/t Erik H)
Brian W is Brian Wolf
Chris T is Chris Travers
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4904
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4935
/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:3712-4904
/branches/1.3/scripts/admin.pl:3711-4678
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3712-4935
/branches/1.3/scripts/admin.pl:3711-4678
Property changes on: trunk/LedgerSMB/Scripts/contact.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4904
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4935
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/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-4904
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4935
/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-4904
/branches/1.3/scripts/file.pl:3711-4880
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4935
/branches/1.3/scripts/file.pl:3711-4880
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4904
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4935
/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:3712-4904
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:3712-4935
/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:3712-4904
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:3712-4935
/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:3712-4904
/branches/1.3/scripts/payment.pl:3711-4680
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:3712-4935
/branches/1.3/scripts/payment.pl:3711-4680
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4904
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4935
/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:3712-4904
/branches/1.3/scripts/setup.pl:3711-4550
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4935
/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:3712-4904
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4935
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Modified: trunk/LedgerSMB/Template/CSV.pm
===================================================================
--- trunk/LedgerSMB/Template/CSV.pm 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/LedgerSMB/Template/CSV.pm 2012-06-21 06:34:05 UTC (rev 4936)
@@ -90,6 +90,10 @@
sub process {
my $parent = shift;
my $cleanvars = shift;
+ for my $col (@{$cleanvars->{columns}}){
+ $col =~ s/""/"/g;
+ $col =~ s/(^"|"$)//g;
+ }
my $template;
my $source;
my $output;
Modified: trunk/locale/po/es_AR.po
===================================================================
--- trunk/locale/po/es_AR.po 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/locale/po/es_AR.po 2012-06-21 06:34:05 UTC (rev 4936)
@@ -1,26 +1,17 @@
-#######
-# Spanish (Argentina)
-#
-# Andres Basile (..hidden..)
-# GNU / GPL
-#######
-
-#######
-# Traduccion General
-#######
-# Archivo: ../LedgerSMB.pot
msgid ""
msgstr ""
-"Project-Id-Version: 1.13.10\n"
+"Project-Id-Version: LedgerSMB 1.13\n"
"Report-Msgid-Bugs-To: ..hidden.."
"POT-Creation-Date: 2012-03-15 00:00-0300\n"
-"PO-Revision-Date: 2012-03-15 00:00-0300\n"
+"PO-Revision-Date: 2012-06-20 13:35-0300\n"
"Last-Translator: Andres Basile <..hidden..>\n"
"Language-Team: \n"
"Language: Spanish (Argentina)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: ARGENTINA\n"
msgid "Add Account"
msgstr "Agregar Cuenta"
@@ -2326,951 +2317,327 @@
msgid "Logged into %1"
msgstr "Ingresado en %1"
-#######
-# MENU
-#######
-# Tabla: menu_node
-# Ordenado por id
-
-# 0
msgid "Top-level"
msgstr "Nivel Raiz"
-# 1
-# msgid "AR"
-# msgstr " "
-
-# 2
msgid "Add Transaction"
msgstr "Agregar Transaccion"
-# 3
-# msgid "Sales Invoice"
-# msgstr " "
-
-# 4
-# msgid "Reports"
-# msgstr " "
-
-# 5
msgid "Transactions"
msgstr "Transacciones"
-# 6
-# msgid "Outstanding"
-# msgstr " "
-
-# 7
msgid "AR Aging"
msgstr "Envejecimiento de Ingreso"
-# 9
msgid "Taxable Sales"
msgstr "Ventas con Impuestos"
-# 10
msgid "Non-Taxable"
msgstr "Sin Impuestos"
-# 11
msgid "Customers"
msgstr "Clientes"
-# 12
msgid "Add Customer"
msgstr "Agregar Cliente"
-# 13
-# msgid "Reports"
-# msgstr " "
-
-# 14
msgid "Search"
msgstr "Buscar"
-# 15
msgid "History"
msgstr "Historial"
-# 16
msgid "Point of Sale"
msgstr "Punto de Venta"
-# 17
msgid "Sale"
msgstr "Venta"
-# 18
-# msgid "Open"
-# msgstr " "
-
-# 19
-# msgid "Receipts"
-# msgstr " "
-
-# 20
msgid "Close Till"
msgstr "Cerra Caja"
-# 21
-# msgid "AP"
-# msgstr " "
-
-# 22
-# msgid "Add Transaction"
-# msgstr " "
-
-# 23
-# msgid "Vendor Invoice"
-# msgstr " "
-
-# 24
-# msgid "Reports"
-# msgstr " "
-
-# 25
-# msgid "Transactions"
-# msgstr " "
-
-# 26
-# msgid "Outstanding"
-# msgstr " "
-
-# 27
msgid "AP Aging"
msgstr "Envejecimiento de Egreso"
-# 28
msgid "Taxable"
msgstr "Imponible"
-# 29
msgid "Non-taxable"
msgstr "No Imponible"
-# 30
msgid "Vendors"
msgstr "Proveedores"
-# 31
msgid "Add Vendor"
msgstr "Agregar Proveedor"
-# 32
-# msgid "Reports"
-# msgstr " "
-
-# 33
-# msgid "Search"
-# msgstr " "
-
-# 34
-# msgid "History"
-# msgstr " "
-
-# 35
-# msgid "Cash"
-# msgstr " "
-
-# 36
-# msgid "Receipt"
-# msgstr " "
-
-# 37
msgid "Use AR Overpayment"
msgstr "Usar Sobrepago de Ingreso"
-# 38
-# msgid "Payment"
-# msgstr " "
-
-# 40
-# msgid "Transfer"
-# msgstr " "
-
-# 41
-# msgid "Reports"
-# msgstr " "
-
-# 42
-# msgid "Receipts"
-# msgstr " "
-
-# 43
-# msgid "Payments"
-# msgstr " "
-
-# 44
msgid "Reconciliation"
msgstr "Reconciliacion"
-# 45
-# msgid "Reconciliation"
-# msgstr " "
-
-# 46
-# msgid "HR"
-# msgstr " "
-
-# 47
msgid "Employees"
msgstr "Empleados"
-# 48
msgid "Add Employee"
msgstr "Agregar Empleado"
-# 49
-# msgid "Search"
-# msgstr " "
-
-# 50
msgid "Order Entry"
msgstr "Entrada de Orden"
-# 51
-# msgid "Sales Order"
-# msgstr " "
-
-# 52
-# msgid "Purchase Order"
-# msgstr " "
-
-# 53
-# msgid "Reports"
-# msgstr " "
-
-# 54
-# msgid "Sales Orders"
-# msgstr " "
-
-# 55
-# msgid "Purchase Orders"
-# msgstr " "
-
-# 56
msgid "Generate"
msgstr "Generar"
-# 57
-# msgid "Sales Orders"
-# msgstr " "
-
-# 58
-# msgid "Purchase Orders"
-# msgstr " "
-
-# 60
msgid "Consolidate"
msgstr "Consolidar"
-# 61
-# msgid "Sales Orders"
-# msgstr " "
-
-# 62
-# msgid "Purchase Orders"
-# msgstr " "
-
-# 63
msgid "Shipping"
msgstr "Envio"
-# 64
-# msgid "Ship"
-# msgstr "Despachar"
-
-# 65
msgid "Receive"
msgstr "Recibo"
-# 66
-# msgid "Transfer"
-# msgstr " "
-
-# 67
-# msgid "Quotations"
-# msgstr " "
-
-# 68
-# msgid "Quotation"
-# msgstr " "
-
-# 69
-# msgid "RFQ"
-# msgstr "PDP"
-
-# 70
-# msgid "Reports"
-# msgstr " "
-
-# 71
-# msgid "Quotations"
-# msgstr " "
-
-# 72
msgid "RFQs"
msgstr "Pedio de Presupuestos"
-# 73
-# msgid "General Journal"
-# msgstr " "
-
-# 74
msgid "Journal Entry"
msgstr "Entrada Diaria"
-# 75
msgid "Adjust Till"
msgstr "Ajustar Caja"
-# 76
-# msgid "Reports"
-# msgstr " "
-
-# 77
msgid "Goods and Services"
msgstr "Bienes y Sevicios"
-# 78
-# msgid "Add Part"
-# msgstr " "
-
-# 79
-# msgid "Add Service"
-# msgstr " "
-
-# 80
-# msgid "Add Assembly"
-# msgstr " "
-
-# 81
msgid "Add Overhead"
msgstr "Agregar Costos Generales"
-# 82
-# msgid "Add Group"
-# msgstr " "
-
-# 83
-# sgid "Add Pricegroup"
-# msgstr " "
-
-# 84
-# msgid "Stock Assembly"
-# msgstr " "
-
-# 85
-# msgid "Reports"
-# msgstr " "
-
-# 86
msgid "All Items"
msgstr "Todos los Items"
-# 87
msgid "Parts"
msgstr "Partes"
-# 88
msgid "Requirements"
msgstr "Requerimientos"
-# 89
msgid "Services"
msgstr "Servicios"
-# 90
msgid "Labor"
msgstr "Tarea"
-# 91
-# msgid "Groups"
-# msgstr " "
-
-# 92
-# msgid "Pricegroups"
-# msgstr " "
-
-# 93
-# msgid "Assembly"
-# msgstr " "
-
-# 94
msgid "Components"
msgstr "Componentes"
-# 95
msgid "Translations"
msgstr "Traducciones"
-# 96
-# msgid "Description"
-# msgstr " "
-
-# 97
msgid "Partsgroup"
msgstr "Grupo de Partes"
-# 98
-# msgid "Projects"
-# msgstr " "
-
-# 99
-# msgid "Add Project"
-# msgstr " "
-
-# 100
msgid "Add Timecard"
msgstr "Agregar Ficha de Horario"
-# 101
-# msgid "Generate"
-# msgstr " "
-
-# 102
-# msgid "Sales Orders"
-# msgstr " "
-
-# 103
-# msgid "Reports"
-# msgstr " "
-
-# 104
-# msgid "Search"
-# msgstr " "
-
-# 105
-# msgid "Transactions"
-# msgstr " "
-
-# 106
msgid "Time CardsTime Cards"
msgstr "Ficha de Horarios"
-# 107
-# msgid "Translations"
-# msgstr " "
-
-# 108
-# msgid "Description"
-# msgstr " "
-
-# 109
-# msgid "Reports"
-# msgstr " "
-
-# 110
-# msgid "Chart of Accounts"
-# msgstr " "
-
-# 111
-# msgid "Trial Balance"
-# msgstr " "
-
-# 112
msgid "Income Statement"
msgstr "Declaracion de Ganancias"
-# 113
msgid "Balance Sheet"
msgstr "Hoja de Balance"
-# 114
msgid "Inventory Activity"
msgstr "Actividad del Inventario"
-# 115
-# msgid "Recurring Transactions"
-# msgstr " "
-
-# 116
msgid "Batch Printing"
msgstr "Lote de Impresion"
-# 117
-# msgid "Sales Invoices"
-# msgstr " "
-
-# 118
-# msgid "Sales Orders"
-# msgstr " "
-
-# 119
msgid "Checks"
msgstr "Control"
-# 120
msgid "Work Orders"
msgstr "Ordenes de Trabajo"
-# 121
-# msgid "Quotations"
-# msgstr " "
-
-# 122
msgid "Packing Lists"
msgstr "Listas de Envio"
-# 123
msgid "Pick Lists"
msgstr "Listas de Retiros"
-# 124
-# msgid "Purchase Orders"
-# msgstr " "
-
-# 125
msgid "Bin Lists"
msgstr "Listas de Codigo Identificatorio Bancario"
-# 126
-# msgid "RFQs"
-# msgstr " "
-
-# 127
-# msgid "Time Cards"
-# msgstr " "
-
-# 128
msgid "System"
msgstr "Sistema"
-# 129
-# msgid "Audit Control"
-# msgstr " "
-
-# 130
-# msgid "Taxes"
-# msgstr " "
-
-# 131
msgid "Defaults"
msgstr "Predeterminados"
-# 132
-# msgid "Yearend"
-# msgstr " "
-
-# 136
-# msgid "Chart of Accounts"
-# msgstr ""
-
-# 137
msgid "Add Accounts"
msgstr "Agregar Cuentas"
-# 138
msgid "List Accounts"
msgstr "Listar Cuentas"
-# 139
msgid "Add GIFI"
msgstr "Agregar GIFI"
-# 140
msgid "List GIFI"
msgstr "Listar GIFI"
-# 141
-msgid "Warehouses"
-msgstr "Depositos"
-
-# 142
-msgid "Add Warehouse"
-msgstr "Agregar Deposito"
-
-# 143
msgid "List Warehouse"
msgstr "Listar Depositos"
-# 144
-msgid "Departments"
-msgstr "Departamentos"
-
-# 145
-msgid "Add Department"
-msgstr "Agregar Departamento"
-
-# 146
msgid "List Departments"
msgstr "Listar Departamentos"
-# 147
-msgid "Type of Business"
-msgstr "Tipo de Negocio"
-
-# 148
-msgid "Add Business"
-msgstr "Agregar Negocio"
-
-# 149
msgid "List Businesses"
msgstr "Listar Negocios"
-# 150
-msgid "Language"
-msgstr "Idioma"
-
-# 151
msgid "Add Language"
msgstr "Agregar Idioma"
-# 152
msgid "List Languages"
msgstr "Listar Idioma"
-# 153
msgid "SIC"
msgstr ""
-# 154
-msgid "Add SIC"
-msgstr "Agregar SIC"
-
-# 155
msgid "List SIC"
msgstr "Listar SIC"
-# 156
msgid "HTML Templates"
msgstr "Plantillas HTML"
-# 157
-# msgid "Income Statement"
-# msgstr ""
-
-# 158
-# msgid "Balance Sheet"
-# msgstr ""
-
-# 159
-# msgid "Invoice"
-# msgstr ""
-
-# 160
-# msgid "AR Transaction"
-# msgstr ""
-
-# 161
-# msgid "AP Transaction"
-# msgstr ""
-
-# 162
-# msgid "Packing List"
-# msgstr " "
-
-# 163
-# msgid "Pick List"
-# msgstr " "
-
-# 164
-# msgid "Sales Order"
-# msgstr " "
-
-# 165
-# msgid "Work Order"
-# msgstr " "
-
-# 166
-# msgid "Purchase Order"
-# msgstr " "
-
-# 167
-# msgid "Bin List"
-# msgstr " "
-
-# 168
-# msgid "Statement"
-# msgstr " "
-
-# 169
-# msgid "Quotation"
-# msgstr " "
-
-# 170
-# msgid "RFQ"
-# msgstr " "
-
-# 171
msgid "Timecard"
msgstr "Ficha de Horario"
-# 172
msgid "LaTeX Templates"
msgstr "Plantilla LaTeX"
-# 173
-# msgid "Invoice"
-# msgstr " "
-
-# 174
-# msgid "AR Transaction"
-# msgstr " "
-
-# 175
-# msgid "AP Transaction"
-# msgstr " "
-
-# 176
-# msgid "Packing List"
-# msgstr " "
-
-# 177
-# msgid "Pick List"
-# msgstr " "
-
-# 178
-# msgid "Sales Order"
-# msgstr " "
-
-# 179
-# msgid "Work Order"
-# msgstr " "
-
-# 180
-# msgid "Purchase Order"
-# msgstr " "
-
-# 181
-# msgid "Bin List"
-# msgstr " "
-
-# 182
-# msgid "Statement"
-# msgstr " "
-
-#### Corrected
-
-# 183
msgid "Check"
msgstr "Cheque"
-# 184
-# msgid "Receipt"
-# msgstr " "
-
-# 185
-# msgid "Quotation"
-# msgstr " "
-
-# 186
-# msgid "RFQ"
-# msgstr " "
-
-# 187
-# msgid "Timecard"
-# msgstr " "
-
-# 188
msgid "Text Templates"
msgstr "Plantilla de Texto"
-# 189
msgid "POS Invoice"
msgstr "Factura de Punto de Venta"
-# 190
msgid "Stylesheet"
msgstr "Hoja de Estilo"
-# 191
-msgid "Preferences"
-msgstr "Preferencias"
-
-# 192
-msgid "New Window"
-msgstr "Ventana Nueva"
-
-# 193
msgid "Logout"
msgstr "Salir"
-# 194
msgid "Credit Note"
msgstr "Nota de Credito"
-# 195
msgid "Credit Invoice"
msgstr "Factura de Credito"
-# 196
msgid "Debit Note"
msgstr "Nota de Debito"
-# 197
msgid "Debit Invoice"
msgstr "Factura de Debito"
-# 198
msgid "AR Voucher"
msgstr "Cupon de Ingreso"
-# 199
msgid "AP Voucher"
msgstr "Cupon de Egreso"
-# 200
msgid "Vouchers"
msgstr "Cupones"
-# 201
-msgid "Payments"
-msgstr "Pagos"
-
-# 202
msgid "Reverse Payment"
msgstr "Pago Inverso"
-# 203
-# msgid "Receipts"
-# msgstr " "
-
-# 204
msgid "Reverse Receipts"
msgstr " "
-# 205
-msgid "Transaction Approval"
-msgstr "Aprobaciones"
-
-# 206
msgid "Batches"
msgstr "Lotes"
-# 210
msgid "Drafts"
msgstr "Borradores"
-# 211
-# msgid "Reconciliation"
-# msgstr " "
-
-# 217
msgid "Tax Forms"
msgstr "Formas de Impuesto"
-# 218
msgid "Add Tax Form"
msgstr "Agregar Forma de Impuesto"
-# 219
msgid "Admin Users"
msgstr "Administrar Usuarios"
-# 220
msgid "Add User"
msgstr "Agregar Usuario"
-# 221
msgid "Search Users"
msgstr "Buscar Usuario"
-# 222
msgid "Sessions"
msgstr "Sesiones"
-# 223
msgid "Use Overpayment"
msgstr "Usar Sobrepago"
-# 225
msgid "List Tax Forms"
msgstr "Listar Formas de Impuesto"
-# 226
-# msgid "Reports"
-# msgstr " "
-
-# 227
msgid "Fixed Assets"
msgstr "Activos Fijo"
-# 228
msgid "Asset Classes"
msgstr "Clases de Activo"
-# 229
msgid "Assets"
msgstr "Activos"
-# 230
msgid "Add Class"
msgstr "Agregar Clase"
-# 231
msgid "List Classes"
msgstr "Listar Clases"
-# 232
msgid "Add Assets"
msgstr "Agregar Activos"
-# 233
msgid "Search Assets"
msgstr "Buscar Activos"
-# 234
msgid "Depreciate"
msgstr "Depreciar"
-# 235
msgid "Import"
msgstr "Importar"
-# 236
-# msgid "Reports"
-# msgstr " "
-
-# 237
msgid "Net Book Value"
msgstr "Valor Neto de Libro"
-# 238
-# msgid "Disposal"
-# msgstr ""
-
-# 239
-# msgid "Depreciation"
-# msgstr " "
-
-# 240
-# msgid "Disposal"
-# msgstr " "
-
-# 241
msgid "Letterhead"
msgstr "Encabezado"
-# 242
-# msgid "Letterhead"
-# msgstr " "
-
-#######
-# EXTRAS
-#######
-
-# AR
-## Add AR Transaction
msgid "Add AR Transaction"
msgstr "Agregar Transaccion de Ingreso"
msgid "Tax Form Applied"
msgstr "Forma de Impuesto Aplicada"
-## Sales Invoice
msgid "TaxForm"
msgstr "Impuestos"
-# Sistema
-## Fin de AÃo
msgid "Retained Earnings"
msgstr "Ganancias Retenidas"
msgid "Post Yearend"
msgstr "Anunciar Fin de AÃo"
-# No encontrados previamente:
msgid "Preferences for %1"
msgstr "Preferencias para %1"
@@ -3280,7 +2647,6 @@
msgid "Employee No."
msgstr "Nro. Empleado"
-### Listar Cuentas
msgid "Debit"
msgstr "Debe"
@@ -3290,7 +2656,6 @@
msgid "Link"
msgstr "Enlace"
-### Usuarios
msgid "New User"
msgstr "Usuario Nuevo"
@@ -3306,8 +2671,6 @@
msgid "Date of Birth"
msgstr "Fecha de Nacimiento"
-#######
-# :
-#######
msgid "Username:"
msgstr "Usuario"
+
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-4904
/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-4935
/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-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/ap_transaction.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -164,9 +164,9 @@
<tr>
<td> </td>
- <td>
- <?lsmb notes ?>
- </td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
<?lsmb IF paid_1 ?>
Modified: trunk/templates/demo/ap_transaction.tex
===================================================================
--- trunk/templates/demo/ap_transaction.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/ap_transaction.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -96,8 +96,11 @@
<?lsmb IF notes ?>
\vspace{0.3cm}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
<?lsmb END ?>
+<?lsmb END ?>
\vspace{0.3cm}
Modified: trunk/templates/demo/ar_transaction.html
===================================================================
--- trunk/templates/demo/ar_transaction.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/ar_transaction.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -163,9 +163,9 @@
<tr>
<td> </td>
- <td>
- <?lsmb notes ?>
- </td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
<?lsmb IF paid_1 ?>
Modified: trunk/templates/demo/ar_transaction.tex
===================================================================
--- trunk/templates/demo/ar_transaction.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/ar_transaction.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -113,8 +113,11 @@
<?lsmb IF notes ?>
\vspace{0.3cm}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
<?lsmb END ?>
+<?lsmb END ?>
\vspace{0.3cm}
Modified: trunk/templates/demo/invoice.html
===================================================================
--- trunk/templates/demo/invoice.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/invoice.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -211,7 +211,9 @@
<table width="100%">
<tr valign=top>
<?lsmb IF notes ?>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
<td><?lsmb text_amount ?> ***** <?lsmb decimal ?>/100</td>
Modified: trunk/templates/demo/invoice.tex
===================================================================
--- trunk/templates/demo/invoice.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/invoice.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -185,8 +185,10 @@
<?lsmb text('All prices in [_1].', currency) ?>
\vspace{12pt}
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
-<?lsmb notes ?>
+<?lsmb END ?>
}
\vfill
Modified: trunk/templates/demo/packing_list.html
===================================================================
--- trunk/templates/demo/packing_list.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/packing_list.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -157,7 +157,9 @@
<table width="100%">
<tr valign=top>
<td>Notes</td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
</table>
</td>
Modified: trunk/templates/demo/packing_list.tex
===================================================================
--- trunk/templates/demo/packing_list.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/packing_list.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -134,8 +134,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\vfill
Modified: trunk/templates/demo/purchase_order.html
===================================================================
--- trunk/templates/demo/purchase_order.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/purchase_order.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -217,7 +217,9 @@
<table width="100%">
<tr valign=top>
<td><?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
</table>
Modified: trunk/templates/demo/purchase_order.tex
===================================================================
--- trunk/templates/demo/purchase_order.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/purchase_order.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -154,8 +154,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
Modified: trunk/templates/demo/request_quotation.html
===================================================================
--- trunk/templates/demo/request_quotation.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/request_quotation.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -173,7 +173,9 @@
<table width="100%">
<tr valign=top>
<td<?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
</table>
Modified: trunk/templates/demo/request_quotation.tex
===================================================================
--- trunk/templates/demo/request_quotation.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/request_quotation.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -138,8 +138,11 @@
\hfill
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\end{document}
Modified: trunk/templates/demo/sales_order.html
===================================================================
--- trunk/templates/demo/sales_order.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/sales_order.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -203,7 +203,9 @@
<tr valign=top>
<?lsmb IF notes ?>
<td><?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
<td align=right nowrap>
<?lsmb text('All prices in [_1] Funds', currency) ?>
Modified: trunk/templates/demo/sales_order.tex
===================================================================
--- trunk/templates/demo/sales_order.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/sales_order.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -163,8 +163,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\vfill
Modified: trunk/templates/demo/sales_quotation.html
===================================================================
--- trunk/templates/demo/sales_quotation.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/sales_quotation.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -171,7 +171,9 @@
<tr valign=top>
<?lsmb IF notes ?>
<td><?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
<td align=right>
<?lsmb text('All prices in [_1] Funds', currency) ?>
Modified: trunk/templates/demo/sales_quotation.tex
===================================================================
--- trunk/templates/demo/sales_quotation.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/sales_quotation.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -128,8 +128,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\vfill
Modified: trunk/templates/demo/timecard.html
===================================================================
--- trunk/templates/demo/timecard.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/timecard.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -118,9 +118,9 @@
<tr>
<td> </td>
- <td>
- <?lsmb notes ?>
- </td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
<?lsmb END ?>
Modified: trunk/templates/demo/timecard.tex
===================================================================
--- trunk/templates/demo/timecard.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/timecard.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -47,7 +47,10 @@
\vspace{0.3cm}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
+<?lsmb END ?>
\end{document}
<?lsmb END ?>
Modified: trunk/templates/demo/work_order.html
===================================================================
--- trunk/templates/demo/work_order.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/work_order.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -159,7 +159,9 @@
<td> </td>
<?lsmb IF notes ?>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
</tr>
</table>
Modified: trunk/templates/demo/work_order.tex
===================================================================
--- trunk/templates/demo/work_order.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/demo/work_order.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -141,7 +141,10 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
+<?lsmb END ?>
}
\vfill
Modified: trunk/templates/xedemo/ap_transaction.html
===================================================================
--- trunk/templates/xedemo/ap_transaction.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/ap_transaction.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<title><?lsmb text('AP Transaction') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
-
<body bgcolor=ffffff>
<table width="100%">
@@ -165,9 +164,9 @@
<tr>
<td> </td>
- <td>
- <?lsmb notes ?>
- </td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
<?lsmb IF paid_1 ?>
Modified: trunk/templates/xedemo/ap_transaction.tex
===================================================================
--- trunk/templates/xedemo/ap_transaction.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/ap_transaction.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -95,8 +95,11 @@
<?lsmb IF notes ?>
\vspace{0.3cm}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
<?lsmb END ?>
+<?lsmb END ?>
\vspace{0.3cm}
Modified: trunk/templates/xedemo/ar_transaction.html
===================================================================
--- trunk/templates/xedemo/ar_transaction.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/ar_transaction.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<title><?lsmb text('AR Transaction') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
-
<body bgcolor=ffffff>
<table width="100%">
@@ -164,9 +163,9 @@
<tr>
<td> </td>
- <td>
- <?lsmb notes ?>
- </td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
<?lsmb IF paid_1 ?>
Modified: trunk/templates/xedemo/ar_transaction.tex
===================================================================
--- trunk/templates/xedemo/ar_transaction.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/ar_transaction.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -112,8 +112,11 @@
<?lsmb IF notes ?>
\vspace{0.3cm}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
<?lsmb END ?>
+<?lsmb END ?>
\vspace{0.3cm}
Modified: trunk/templates/xedemo/bin_list.html
===================================================================
--- trunk/templates/xedemo/bin_list.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/bin_list.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<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/xedemo/invoice.html
===================================================================
--- trunk/templates/xedemo/invoice.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/invoice.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -211,7 +211,9 @@
<table width="100%">
<tr valign=top>
<?lsmb IF notes ?>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
<td><?lsmb text_amount ?> ***** <?lsmb decimal ?>/100</td>
Modified: trunk/templates/xedemo/invoice.tex
===================================================================
--- trunk/templates/xedemo/invoice.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/invoice.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -184,7 +184,10 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
+<?lsmb END ?>
}
\vfill
Modified: trunk/templates/xedemo/packing_list.html
===================================================================
--- trunk/templates/xedemo/packing_list.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/packing_list.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<title><?lsmb text('Packing List') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
-
<body bgcolor=ffffff>
<table width="100%">
@@ -158,7 +157,9 @@
<table width="100%">
<tr valign=top>
<td>Notes</td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
</table>
</td>
Modified: trunk/templates/xedemo/packing_list.tex
===================================================================
--- trunk/templates/xedemo/packing_list.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/packing_list.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -133,8 +133,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\vfill
Modified: trunk/templates/xedemo/pick_list.html
===================================================================
--- trunk/templates/xedemo/pick_list.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/pick_list.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<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/xedemo/purchase_order.html
===================================================================
--- trunk/templates/xedemo/purchase_order.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/purchase_order.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<title><?lsmb text('Purchase Order') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
-
<body bgcolor=ffffff>
<table width="100%">
@@ -218,7 +217,9 @@
<table width="100%">
<tr valign=top>
<td><?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
</table>
Modified: trunk/templates/xedemo/purchase_order.tex
===================================================================
--- trunk/templates/xedemo/purchase_order.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/purchase_order.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -153,8 +153,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
Modified: trunk/templates/xedemo/request_quotation.html
===================================================================
--- trunk/templates/xedemo/request_quotation.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/request_quotation.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<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%">
@@ -174,7 +173,9 @@
<table width="100%">
<tr valign=top>
<td<?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
</table>
Modified: trunk/templates/xedemo/request_quotation.tex
===================================================================
--- trunk/templates/xedemo/request_quotation.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/request_quotation.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -137,8 +137,11 @@
\hfill
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\end{document}
Modified: trunk/templates/xedemo/sales_order.html
===================================================================
--- trunk/templates/xedemo/sales_order.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/sales_order.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -203,7 +203,9 @@
<tr valign=top>
<?lsmb IF notes ?>
<td><?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
<td align=right nowrap>
<?lsmb text('All prices in [_1] Funds', currency) ?>
Modified: trunk/templates/xedemo/sales_order.tex
===================================================================
--- trunk/templates/xedemo/sales_order.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/sales_order.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -162,8 +162,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\vfill
Modified: trunk/templates/xedemo/sales_quotation.html
===================================================================
--- trunk/templates/xedemo/sales_quotation.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/sales_quotation.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<title><?lsmb text('Quotation') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
-
<body bgcolor=ffffff>
<table width="100%">
@@ -172,7 +171,9 @@
<tr valign=top>
<?lsmb IF notes ?>
<td><?lsmb text('Notes') ?></td>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
<td align=right>
<?lsmb text('All prices in [_1] Funds', currency) ?>
Modified: trunk/templates/xedemo/sales_quotation.tex
===================================================================
--- trunk/templates/xedemo/sales_quotation.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/sales_quotation.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -129,8 +129,11 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+<?lsmb END ?>
+
}
\vfill
Modified: trunk/templates/xedemo/statement.html
===================================================================
--- trunk/templates/xedemo/statement.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/statement.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -4,7 +4,6 @@
<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/xedemo/timecard.html
===================================================================
--- trunk/templates/xedemo/timecard.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/timecard.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -118,9 +118,9 @@
<tr>
<td> </td>
- <td>
- <?lsmb notes ?>
- </td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
</tr>
<?lsmb END ?>
Modified: trunk/templates/xedemo/timecard.tex
===================================================================
--- trunk/templates/xedemo/timecard.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/timecard.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -46,7 +46,10 @@
\vspace{0.3cm}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
+<?lsmb END ?>
\end{document}
<?lsmb END ?>
Modified: trunk/templates/xedemo/work_order.html
===================================================================
--- trunk/templates/xedemo/work_order.html 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/work_order.html 2012-06-21 06:34:05 UTC (rev 4936)
@@ -159,7 +159,9 @@
<td> </td>
<?lsmb IF notes ?>
- <td><?lsmb notes ?></td>
+ <td><?lsmb FOREACH P IN notes.split('\n\n') ?>
+ <p><?lsmb P ?></p>
+ <?lsmb END ?></td>
<?lsmb END ?>
</tr>
</table>
Modified: trunk/templates/xedemo/work_order.tex
===================================================================
--- trunk/templates/xedemo/work_order.tex 2012-06-21 06:15:24 UTC (rev 4935)
+++ trunk/templates/xedemo/work_order.tex 2012-06-21 06:34:05 UTC (rev 4936)
@@ -140,7 +140,10 @@
\vspace{12pt}
-<?lsmb notes ?>
+<?lsmb FOREACH P IN notes.split('\n\n') ?>
+<?lsmb P ?>\medskip
+
+<?lsmb END ?>
}
\vfill
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.