SF.net SVN: ledger-smb:[5125] trunk

[..hidden..]

Revision: 5125
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5125&view=rev
Author:   einhverfr
Date:     2012-09-04 09:01:13 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
HTML templates for payroll income and deduction types

Modified Paths:
--------------
    trunk/sql/Pg-database.sql

Added Paths:
-----------
    trunk/UI/payroll/
    trunk/UI/payroll/deduction.html
    trunk/UI/payroll/income.html

Added: trunk/UI/payroll/deduction.html
===================================================================
--- trunk/UI/payroll/deduction.html	                        (rev 0)
+++ trunk/UI/payroll/deduction.html	2012-09-04 09:01:13 UTC (rev 5125)
@@ -0,0 +1,101 @@
+<?lsmb 
+
+INCLUDE "ui-header.html";
+
+PROCESS "elements.html";
+
+?>
+<div class="listtop"><?lsmb text('Deduction Type') ?></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+countries.push({});
+
+PROCESS select element_data = {
+           default_values = [country_id]
+                  options = countries
+                     name = 'country_id',
+                text_attr = 'name',
+               value_attr = 'id',
+                    label = text('Country')
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+ deduction_classes.push({});
+
+PROCESS select element_data = {
+           default_values = [pdc_id]
+                  options = deduction_classes
+                     name = 'pdc_id',
+                text_attr = 'label',
+               value_attr = 'id',
+                    label = text('Deduction Class') #'
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+accounts.push({});
+
+FOREACH a IN accounts;
+   a.label = a.accno _ '--' _ a.description;
+END;
+
+PROCESS select element_data = {
+           default_values = [account_id]
+                  options = accounts
+                     name = 'account_id',
+                text_attr = 'label',
+               value_attr = 'id',
+                    label = text('Account')
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+PROCESS input element_data = {
+    name = 'label'
+   value = label
+    type = 'text'
+    size = '20'
+   class = 'control_code'
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+PROCESS input element_data = {
+    name = 'unit'
+   value = unit
+    type = 'text'
+    size = '10'
+   class = 'unit'
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+PROCESS input element_data = {
+    name = 'default_amount'
+   value = default_amount
+    type = 'text'
+    size = '25'
+   class = 'amount'
+} ?></div></div>
+<div class="input_row">
+<?lsmb
+
+PROCESS button element_data = {
+    name = 'action'
+   value = 'show_deduction_type'
+   class = 'submit'
+    type = 'submit'
+    text = text('Update')
+};
+
+PROCESS button element_data = {
+    name = 'action'
+   value = 'save_deduction_type'
+   class = 'submit'
+    type = 'submit'
+    text = text('Save')
+]; ?></div>
+</body>
+</html>

Added: trunk/UI/payroll/income.html
===================================================================
--- trunk/UI/payroll/income.html	                        (rev 0)
+++ trunk/UI/payroll/income.html	2012-09-04 09:01:13 UTC (rev 5125)
@@ -0,0 +1,101 @@
+<?lsmb 
+
+INCLUDE "ui-header.html";
+
+PROCESS "elements.html";
+
+?>
+<div class="listtop"><?lsmb text('Income Type') ?></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+countries.push({});
+
+PROCESS select element_data = {
+           default_values = [country_id]
+                  options = countries
+                     name = 'country_id',
+                text_attr = 'name',
+               value_attr = 'id',
+                    label = text('Country')
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+income_classes.push({});
+
+PROCESS select element_data = {
+           default_values = [pic_id]
+                  options = income_classes
+                     name = 'pic_id',
+                text_attr = 'label',
+               value_attr = 'id',
+                    label = text('Income Class') #'
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+accounts.push({});
+
+FOREACH a IN accounts;
+   a.label = a.accno _ '--' _ a.description;
+END;
+
+PROCESS select element_data = {
+           default_values = [account_id]
+                  options = accounts
+                     name = 'account_id',
+                text_attr = 'label',
+               value_attr = 'id',
+                    label = text('Account')
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+PROCESS input element_data = {
+    name = 'label'
+   value = label
+    type = 'text'
+    size = '20'
+   class = 'control_code'
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+PROCESS input element_data = {
+    name = 'unit'
+   value = unit
+    type = 'text'
+    size = '10'
+   class = 'unit'
+}; ?></div></div>
+<div class="input_row">
+<div class="input_group"><?lsmb 
+
+PROCESS input element_data = {
+    name = 'default_amount'
+   value = default_amount
+    type = 'text'
+    size = '25'
+   class = 'amount'
+} ?></div></div>
+<div class="input_row">
+<?lsmb
+
+PROCESS button element_data = {
+    name = 'action'
+   value = 'show_income_type'
+   class = 'submit'
+    type = 'submit'
+    text = text('Update')
+};
+
+PROCESS button element_data = {
+    name = 'action'
+   value = 'save_income_type'
+   class = 'submit'
+    type = 'submit'
+    text = text('Save')
+]; ?></div>
+</body>
+</html>

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2012-08-21 09:17:23 UTC (rev 5124)
+++ trunk/sql/Pg-database.sql	2012-09-04 09:01:13 UTC (rev 5125)
@@ -973,14 +973,14 @@
 CREATE TABLE payroll_deduction_type (
    id serial not null unique,
    account_id int not null references account(id),
-   pic_id int not null,
+   pdc_id int not null,
    country_id int not null,
    label text not null,
    unit text not null,
    default_amount numeric,
    calc_percent bool not null,
-   foreign key(pic_id, country_id) 
-              references payroll_income_class(id, country_id)
+   foreign key(pdc_id, country_id) 
+              references payroll_deduction_class(id, country_id)
 );
 
 CREATE TABLE payroll_deduction (

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.