[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[6219] trunk
- Subject: SF.net SVN: ledger-smb:[6219] trunk
- From: ..hidden..
- Date: Tue, 5 Nov 2013 10:35:10 +0000
Revision: 6219
http://sourceforge.net/p/ledger-smb/code/6219
Author: einhverfr
Date: 2013-11-05 10:35:09 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
Merging Istvan's changes regarding create date to 1.4
Modified Paths:
--------------
trunk/LedgerSMB/IR.pm
trunk/LedgerSMB/IS.pm
trunk/UI/Vendor/vendor.html
trunk/UI/employee.html
trunk/bin/aa.pl
trunk/bin/ir.pl
trunk/bin/is.pl
trunk/sql/Pg-database.sql
trunk/t/data/04-complex_template.html
Property Changed:
----------------
trunk/LedgerSMB/IR.pm
trunk/LedgerSMB/IS.pm
trunk/UI/Vendor/vendor.html
trunk/UI/employee.html
trunk/bin/aa.pl
trunk/bin/ir.pl
trunk/bin/is.pl
trunk/sql/modules/Company.sql
trunk/t/data/04-complex_template.html
Modified: trunk/LedgerSMB/IR.pm
===================================================================
--- trunk/LedgerSMB/IR.pm 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/LedgerSMB/IR.pm 2013-11-05 10:35:09 UTC (rev 6219)
@@ -1385,7 +1385,7 @@
mail_code as zipcode, c.name as country,
pay_to_name as contact,
phone as vendorphone, fax as vendorfax,
- tax_id AS vendortaxnumber, sic_code AS sic, iban, bic,
+ tax_id AS vendortaxnumber, sic_code AS sic, iban, bic, remark,
-- gifi_accno AS gifi,
startdate, enddate
FROM entity_credit_account eca
Property changes on: trunk/LedgerSMB/IR.pm
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T10:44:38.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0770
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/LedgerSMB/IS.pm 2013-11-05 10:35:09 UTC (rev 6219)
@@ -900,7 +900,7 @@
l.state as state, l.mail_code AS zipcode,
country.name as country,
'' as contact, '' as customerphone, '' as customerfax,
- '' AS customertaxnumber, sic_code AS sic, iban,
+ '' AS customertaxnumber, sic_code AS sic, iban, remark,
bic,eca.startdate,eca.enddate
FROM company cm
JOIN entity e ON (cm.entity_id = e.id)
Property changes on: trunk/LedgerSMB/IS.pm
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T10:45:04.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0770
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Modified: trunk/UI/Vendor/vendor.html
===================================================================
--- trunk/UI/Vendor/vendor.html 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/UI/Vendor/vendor.html 2013-11-05 10:35:09 UTC (rev 6219)
@@ -76,6 +76,10 @@
<label for="iban">IBAN:</label>
<input id="iban" name="iban" type="textarea" value="<?vendor.iban?>">
</td>
+ <td>
+ <label for="remark">Remark:</label>
+ <input id="remark" name="remark" type="textarea" value="<?vendor.remark?>">
+ </td>
</tr>
<tr>
@@ -136,4 +140,4 @@
</tr>
</table>
</form>
-</div>
\ No newline at end of file
+</div>
Property changes on: trunk/UI/Vendor/vendor.html
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T10:48:24.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0770
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Modified: trunk/UI/employee.html
===================================================================
--- trunk/UI/employee.html 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/UI/employee.html 2013-11-05 10:35:09 UTC (rev 6219)
@@ -147,6 +147,12 @@
<input type="text" maxlength="34" name="iban" value="<?lsmb iban ?>" />
</span>
</div>
+ <div class="input_row" id="remark_row">
+ <span class="input_label"><?lsmb text('Remark') ?></span>
+ <span class="input_field">
+ <input type="text" maxlength="34" name="remark" value="<?lsmb remark ?>" />
+ </span>
+ </div>
<div class="input_row" id="bic_row">
<span class="input_label"><?lsmb text('BIC') ?></span>
<span class="input_field">
Property changes on: trunk/UI/employee.html
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T10:58:13.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0770
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/bin/aa.pl 2013-11-05 10:35:09 UTC (rev 6219)
@@ -675,6 +675,10 @@
<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
<td><input name=ordnumber id=ordnum size=20 value="$form->{ordnumber}"></td>
</tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Invoice Created') . qq|</th>
+ <td><input name=crdate size=11 title="($myconfig{'dateformat'})" value=$form->{crdate}></td>
+ </tr>
<tr>
<th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
<td><input name=transdate id=transdate size=11 title="($myconfig{'dateformat'})" value=$form->{transdate}></td>
Property changes on: trunk/bin/aa.pl
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T14:18:36.712925Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0600
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+0 root
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+0 root
\ No newline at end of property
Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/bin/ir.pl 2013-11-05 10:35:09 UTC (rev 6219)
@@ -552,6 +552,10 @@
<td><input name=ordnumber size=20 value="$form->{ordnumber}"></td>
<input type=hidden name=quonumber value="$form->{quonumber}">
</tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Invoice Created') . qq|</th>
+ <td><input class="date" name=crdate size=11 title="$myconfig{dateformat}" value=$form->{crdate}></td>
+ </tr>
<tr>
<th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
<td><input class="date" name=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" id="transdate"></td>
Property changes on: trunk/bin/ir.pl
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T14:22:08.364598Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0600
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+0 root
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+0 root
\ No newline at end of property
Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/bin/is.pl 2013-11-05 10:35:09 UTC (rev 6219)
@@ -278,6 +278,7 @@
$form->{AR} = $form->{AR_1} unless $form->{id};
$form->{transdate} = $form->{current_date} if (!$form->{transdate});
+ $form->{crdate} = $form->{current_date};
$form->{locked} =
( $form->{revtrans} )
? '1'
@@ -592,7 +593,11 @@
<td><input name="ordnumber" id="ordnumber" size="20" value="$form->{ordnumber}"></td>
<input type=hidden name="quonumber" value="$form->{quonumber}">
</tr>
- <tr>
+ <tr class="crdate-row">
+ <th align=right>| . $locale->text('Invoice Created') . qq|</th>
+ <td><input class="date" name="crdate" size="11" title="$myconfig{dateformat}" value="$form->{crdate}"></td>
+ </tr>
+ <tr class="transdate-row">
<th align=right>| . $locale->text('Invoice Date') . qq|</th>
<td><input class="date" name="transdate" id="transdate" size="11" title="$myconfig{dateformat}" value="$form->{transdate}"></td>
</tr>
Property changes on: trunk/bin/is.pl
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-28T17:34:15.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0770
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/sql/Pg-database.sql 2013-11-05 10:35:09 UTC (rev 6219)
@@ -818,6 +818,7 @@
entity_id int not null references entity(id) ON DELETE CASCADE,
bic varchar,
iban varchar,
+ remark varchar,
UNIQUE (id),
PRIMARY KEY (entity_id, bic, iban)
);
@@ -832,6 +833,12 @@
$$ International Bank Account Number. used to store the actual account number
for the banking institution.$$;
+COMMENT ON COLUMN entity_bank_account.remark IS
+$$ This field contains the notes for an account, like: This is USD account, this one is HUF account, this one is the default account, this account for paying specific taxes. If a $
+$$;
+
+
+
CREATE TABLE entity_credit_account (
id serial not null unique,
entity_id int not null references entity(id) ON DELETE CASCADE,
Index: trunk/sql/modules/Company.sql
===================================================================
--- trunk/sql/modules/Company.sql 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/sql/modules/Company.sql 2013-11-05 10:35:09 UTC (rev 6219)
Property changes on: trunk/sql/modules/Company.sql
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T11:04:07.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0770
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Modified: trunk/t/data/04-complex_template.html
===================================================================
--- trunk/t/data/04-complex_template.html 2013-11-04 13:02:52 UTC (rev 6218)
+++ trunk/t/data/04-complex_template.html 2013-11-05 10:35:09 UTC (rev 6219)
@@ -556,12 +556,14 @@
<tr class="listheading">
<th class="bic"><?lsmb text('BIC/SWIFT Code') ?></th>
<th class="iban"><?lsmb text('Account Number') ?></th>
+ <th class="remark"><?lsmb text('Remark') ?></th>
<th class="actions"><?lsmb text('Actions') ?></th>
</tr>
<?lsmb FOREACH ba = bank_account ?>
<tr>
<td class="bic"><?lsmb ba.bic ?></td>
<td class="iban"><?lsmb ba.iban ?></td>
+ <td class="remark"><?lsmb ba.remark ?></td>
<td class="actions">
<a href="<?lsmb script ?>?action=edit_bank_acct&entity_id=<?lsmb
entity_id ?>&bank_account_id=<?lsmb ba.id ?>"
@@ -602,6 +604,15 @@
size=20
} #' ?>
</div>
+ <div><label for="remark">
+ <?lsmb PROCESS input element_data = {
+ type="text"
+ label = text('Remark:')
+ name="remark"
+ value=remark
+ size=20
+ } #' ?>
+ </div>
<div><?lsmb PROCESS button element_data = {
name="action"
value="save_bank_account"
Property changes on: trunk/t/data/04-complex_template.html
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-08-30T10:53:29.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0770
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits