From 82254cc7c2fab1a48c291f75a0a04f2fdaaa6b11 Mon Sep 17 00:00:00 2001 From: einhverfr Date: Tue, 4 Mar 2008 19:47:19 +0000 Subject: Adding David Mora's single-payment interface patches git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2098 4979c152-3d1c-0410-bac9-87ea11338e46 --- UI/am-account-form.html | 73 ++++++++++++--------- UI/payments/payment1.html | 70 ++++++++------------- UI/payments/payment2.html | 157 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 199 insertions(+), 101 deletions(-) (limited to 'UI') diff --git a/UI/am-account-form.html b/UI/am-account-form.html index 34482b51..64bffb8b 100644 --- a/UI/am-account-form.html +++ b/UI/am-account-form.html @@ -10,14 +10,14 @@ - - @@ -28,32 +28,32 @@
'accno', size => '20', value => form.accno} ?>
'description', size => '40', value => form.description} ?>
- @@ -228,12 +241,12 @@
- 'category', type => 'radio', label => text('Asset'), value => 'A', ${checked.A_} => checked.A_, } ?>
- 'category', type => 'radio', label => text('Liability'), ${checked.L_} => checked.L_, value => 'L'} ?>
- 'category', type => 'radio', label => text('Equity'), ${checked.Q_} => checked.Q_, value => 'Q'} ?>
- 'category', type => 'radio', label => text('Income'), ${checked.I_} => checked.I_, value => 'I'} ?>
- 'category', type => 'radio', label => text('Expense'), @@ -61,7 +61,7 @@ value => 'E'} ?>
- 'contra', type => 'checkbox', label => text('Contra'), @@ -69,13 +69,13 @@ value => '1'} ?> - 'charttype', type => 'radio', label => text('Heading'), ${checked.H} => checked.H, value => 'H'} ?>
- 'charttype', type => 'radio', label => text('Account'), @@ -93,19 +93,19 @@
- 'AR', type => 'checkbox', label => text('AR'), ${form.AR} => form.AR, value => 'AR'} ?> - 'AP', type => 'checkbox', label => text('AP'), ${form.AP} => form.AP, value => 'AP'} ?> - 'IC', type => 'checkbox', label => text('Inventory'), @@ -130,59 +130,72 @@
- 'AR_amount', type => 'checkbox', label => text('Income'), ${form.AR_amount} => form.AR_amount, value => 'AR_amount'} ?>
- 'AR_paid', type => 'checkbox', label => text('Payment'), ${form.AR_paid} => form.AR_paid, value => 'AR_paid'} ?>
- 'AR_tax', type => 'checkbox', label => text('Tax'), ${form.AR_tax} => form.AR_tax, - value => 'AR_tax'} ?> + value => 'AR_tax'} ?>
+ 'AR_overpayment', + type => 'checkbox', + label => text('Overpayment'), + ${form.AR_overpayment} => form.AR_overpayment, + value => 'AR_overpayment'} ?> +
- 'AP_amount', type => 'checkbox', label => text('Expense/Asset'), ${form.AP_amount} => form.AP_amount, value => 'AP_amount'} ?>
- 'AP_paid', type => 'checkbox', label => text('Payment'), ${form.AP_paid} => form.AP_paid, value => 'AP_paid'} ?>
- 'AP_tax', type => 'checkbox', label => text('Tax'), ${form.AP_tax} => form.AP_tax, - value => 'AP_tax'} ?> + value => 'AP_tax'} ?>
+ 'AP_overpayment', + type => 'checkbox', + label => text('Overpayment'), + ${form.AP_overpayment} => form.AP_overpayment, + value => 'AP_overpayment'} ?>
- 'IC_sale', type => 'checkbox', label => text('Income'), ${form.IC_sale} => form.IC_sale, value => 'IC_sale'} ?>
- 'IC_cogs', type => 'checkbox', label => text('COGS'), ${form.IC_cogs} => form.IC_cogs, value => 'IC_cogs'} ?>
- 'IC_taxpart', type => 'checkbox', label => text('Tax'), @@ -190,19 +203,19 @@ value => 'IC_taxpart'} ?>
- 'IC_income', type => 'checkbox', label => text('Income'), ${form.IC_income} => form.IC_income, value => 'IC_income'} ?>
- 'IC_expense', type => 'checkbox', label => text('Expense'), ${form.IC_expense} => form.IC_expense, value => 'IC_expense'} ?>
- 'IC_taxservice', type => 'checkbox', label => text('Tax'), @@ -217,7 +230,7 @@
'gifi_accno', size => '9', value => form.gifi_accno} ?>

'hidden', name => hidden, value => hiddens.item(hidden) }; END ?> - + diff --git a/UI/payments/payment1.html b/UI/payments/payment1.html index d064ad0e..6d2d2216 100644 --- a/UI/payments/payment1.html +++ b/UI/payments/payment1.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - <?lsmb titlebar ?> + <?lsmb titlebar -?> @@ -16,46 +16,19 @@
- - - - - - - - - - - - - - - - - - + + + - - - - - - - + -?> +
- - - - - - - + + + + diff --git a/UI/payments/payment2.html b/UI/payments/payment2.html index e1a5964e..335fc778 100644 --- a/UI/payments/payment2.html +++ b/UI/payments/payment2.html @@ -7,11 +7,12 @@ - + - + @@ -19,14 +20,14 @@ INCLUDE input element_data=accountclass ?> -
- -
@@ -78,19 +51,26 @@
- - - +
>= + datefrom.type = "text"; + datefrom.size = "10" ; + datefrom.maxlenght = "10" ; + datefrom.name = "datefrom"; + INCLUDE input element_data=datefrom; + -?> + <= +
+
- - -
+ + +
@@ -35,7 +36,7 @@ - + + + + +
@@ -116,15 +117,14 @@ - @@ -140,7 +140,7 @@ - + @@ -157,9 +157,15 @@ - - + -
: - - - + + + - +
">
-
"> -
+
+ + " + onClick="maximize_minimize('div_topay_', + 'topaystate_' ,this, + 'UI/payments/img/down.gif', 'UI/payments/img/up.gif')"> +
"> @@ -193,25 +199,124 @@
-
- - - + + + + +
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
X
+ -- + + + + + + + + + +
+ + + + + +
 
 
+ +
+ + + - +
+ + + +
\ No newline at end of file -- cgit v1.2.3