Skip to content

Commit

Permalink
* Fix ledgersmb#1178: typos beeing > being, wich > which
Browse files Browse the repository at this point in the history
Conflicts:
	LedgerSMB/DBObject/Payment.pm
	LedgerSMB/Scripts/payment.pm
	UI/payments/payment2.html

Conflicts:
	LedgerSMB/Scripts/payment.pm
	doc/dev_manual/model.tex
	ledgersmb.conf.default
	t/data/ledgersmb.conf
  • Loading branch information
sbts committed Jan 4, 2016
1 parent fa06140 commit 0f5e690
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions LedgerSMB/DBObject/Payment.pm
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@ sub get_open_invoices {
=item $payment->get_open_invoice()
This function is an especific case of get_open_invoices(), because get_open_invoice()
can search for a specific invoice, wich can be searched by the $payment->{invnumber}
variable
This function is an especific case of get_open_invoices(), because get_open_invoice()
can search for a specific invoice, which can be searched by the $payment->{invnumber}
variable
=back
Expand Down Expand Up @@ -421,7 +421,7 @@ The list is attached to $self->{departments} and returned.
This method gets a list of the open currencies inside the database, it requires that
$self->{account_class} (must be 1 or 2) exist to work.
WARNING THIS IS NOT BEEING USED BY THE SINGLE PAYMENT SYSTEM....
WARNING THIS IS NOT BEING USED BY THE SINGLE PAYMENT SYSTEM....
=back
Expand Down
4 changes: 2 additions & 2 deletions UI/payments/payment2.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@
} ?>
</td>
</tr>
<tr id="date_row"><?lsmb # here goes an input where the date can be written, we can also use a java calendar :). We can use an ajax script to call the Exchange rate of the input date wich can be called with the onChange Method ?>
<tr id="date_row"><?lsmb # here goes an input where the date can be written, we can also use a java calendar :). We can use an ajax script to call the Exchange rate of the input date which can be called with the onChange Method ?>
<th align="right" nowrap id="date_label_column"><?lsmb text('Date') ?></th>
<td colspan="2" id="date_column"> <?lsmb INCLUDE input element_data=datepaid ?><?lsmb datepaid.id='olddatepaid'; datepaid.name='olddatepaid'; datepaid.type='hidden'; INCLUDE input element_data=datepaid ?> </td>
</tr>
<tr id="source_row">
<?lsmb # here goes all the posible sources wich we can use -?>
<?lsmb # here goes all the posible sources which we can use -?>
<th align="right" nowrap id="source_label_column"><?lsmb text('Source')?></th>
<td width="28%" id="source_column">
<select id="source" name="source">
Expand Down
2 changes: 1 addition & 1 deletion UI/payments/use_overpayment2.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</td>
<td align="right" id="curr_exrate_date_column">
<table id="curr_exrate_date_table">
<tr id="date_row"><?lsmb # here goes an input where the date can be written, we can also use a java calendar :). We can use an ajax script to call the Exchange rate of the input date wich can be called with the onChange Method ?>
<tr id="date_row"><?lsmb # here goes an input where the date can be written, we can also use a java calendar :). We can use an ajax script to call the Exchange rate of the input date which can be called with the onChange Method ?>
<th align="right" nowrap id="date_label_column"><?lsmb text('Date')?>:</th>
<td colspan="2" id="date_column"> <?lsmb INCLUDE input element_data=datepaid ?> </td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion ledgersmb.conf.default
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
auth : DB
logging : 0
#Be aware of tempdir setting.If client_browser and server_apache on same machine, sharing tmp-dir , problems 'Permission denied' if server tries to write temp-file wich already exists as client-owned
#Be aware of tempdir setting.If client_browser and server_apache on same machine, sharing tmp-dir , problems 'Permission denied' if server tries to write temp-file which already exists as client-owned
tempdir : /tmp/ledgersmb

# This is the logical CSS directory. I.e. it is what comes before the
Expand Down
2 changes: 1 addition & 1 deletion t/data/ledgersmb.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
auth : DB2
logging : 1
#Be aware of tempdir setting.If client_browser and server_apache on same machine, sharing tmp-dir , problems 'Permission denied' if server tries to write temp-file wich already exists as client-owned
#Be aware of tempdir setting.If client_browser and server_apache on same machine, sharing tmp-dir , problems 'Permission denied' if server tries to write temp-file which already exists as client-owned
tempdir : test

# This is the logical CSS directory. I.e. it is what comes before the
Expand Down

0 comments on commit 0f5e690

Please sign in to comment.