[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.uiinvoice.inc.php,1.25,1.26 c
|
From: |
Guillaume Courtois <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.uiinvoice.inc.php,1.25,1.26 class.uiwo_hour.inc.php,1.25,1.26 class.uiproject.inc.php,1.23,1.24 class.uiworkorder.inc.php,1.21,1.22 class.uidrawing.inc.php,1.19,1.20 class.uirequest.inc.php,1.17,1.18 class.uidocument.inc.php,1.9,1.10class.uiinvestment.inc.php,1.19,1.20 |
|
Date: |
Thu, 12 Jun 2003 16:51:17 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv13615/property/inc
Modified Files:
class.uiinvoice.inc.php class.uiwo_hour.inc.php
class.uiproject.inc.php class.uiworkorder.inc.php
class.uidrawing.inc.php class.uirequest.inc.php
class.uidocument.inc.php class.uiinvestment.inc.php
Log Message:
Corrected typos, suppressed doublons, added french translations.
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uiinvoice.inc.php 23 May 2003 08:40:19 -0000 1.25
--- class.uiinvoice.inc.php 12 Jun 2003 20:51:13 -0000 1.26
***************
*** 357,361 ****
$content[$i]['amount']
= number_format($content[$i]['amount'], 2, ',', ' ');
$content[$i]['paid']
= $paid;
!
$content[$i]['lang_tax_code_statustext'] = lang('select the appropiate
tax code');
$content[$i]['tax_code_list']
= $this->bo->tax_code_list($content[$i]['tax_code']);
$content[$i]['lang_remark']
= lang('Remark');
--- 357,361 ----
$content[$i]['amount']
= number_format($content[$i]['amount'], 2, ',', ' ');
$content[$i]['paid']
= $paid;
!
$content[$i]['lang_tax_code_statustext'] = lang('select the appropriate
tax code');
$content[$i]['tax_code_list']
= $this->bo->tax_code_list($content[$i]['tax_code']);
$content[$i]['lang_remark']
= lang('Remark');
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uiwo_hour.inc.php 9 Jun 2003 20:48:40 -0000 1.25
--- class.uiwo_hour.inc.php 12 Jun 2003 20:51:13 -0000 1.26
***************
*** 171,177 ****
'lang_sum_calculation' =>
lang('Sum calculation'),
'value_sum_calculation' =>
number_format($sum_hour, 2, ',', ' '),
! 'lang_addition_rs'
=> lang('Rig adition'),
'value_addition_rs'
=> number_format($workorder['addition_rs'], 2, ',', ' '),
! 'lang_addition_percentage' =>
lang('Percentage adition'),
'value_addition_percentage' =>
number_format($addition_percentage, 2, ',', ' '),
'lang_sum_tax'
=> lang('Sum tax'),
--- 171,177 ----
'lang_sum_calculation' =>
lang('Sum calculation'),
'value_sum_calculation' =>
number_format($sum_hour, 2, ',', ' '),
! 'lang_addition_rs'
=> lang('Rig addition'),
'value_addition_rs'
=> number_format($workorder['addition_rs'], 2, ',', ' '),
! 'lang_addition_percentage' =>
lang('Percentage addition'),
'value_addition_percentage' =>
number_format($addition_percentage, 2, ',', ' '),
'lang_sum_tax'
=> lang('Sum tax'),
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uiproject.inc.php 26 May 2003 18:18:17 -0000 1.23
--- class.uiproject.inc.php 12 Jun 2003 20:51:13 -0000 1.24
***************
*** 192,196 ****
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup='
. $lookup),
! 'lang_history_statustext' =>
lang('searh for history at this location'),
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
--- 192,196 ----
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup='
. $lookup),
! 'lang_history_statustext' =>
lang('search for history at this location'),
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.uiworkorder.inc.php 23 May 2003 08:40:19 -0000 1.21
--- class.uiworkorder.inc.php 12 Jun 2003 20:51:13 -0000 1.22
***************
*** 206,210 ****
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
! 'lang_history_statustext' =>
lang('searh for history at this location'),
'links'
=> $links,
'allow_allrows'
=> false,
--- 206,210 ----
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
! 'lang_history_statustext' =>
lang('search for history at this location'),
'links'
=> $links,
'allow_allrows'
=> false,
***************
*** 494,502 ****
'value_power_meter'
=> $project['power_meter'],
! 'lang_addition_rs'
=> lang('Rig adition'),
'lang_addition_rs_statustext' => lang('Enter
any round sum addition per order'),
'value_addition_rs'
=> $values['addition_rs'],
! 'lang_addition_percentage'
=> lang('Percentage adition'),
'lang_addition_percentage_statustext' =>
lang('Enter any persentage addition per unit'),
'value_addition_percentage'
=> $values['addition_percentage'],
--- 494,502 ----
'value_power_meter'
=> $project['power_meter'],
! 'lang_addition_rs'
=> lang('Rig addition'),
'lang_addition_rs_statustext' => lang('Enter
any round sum addition per order'),
'value_addition_rs'
=> $values['addition_rs'],
! 'lang_addition_percentage'
=> lang('Percentage addition'),
'lang_addition_percentage_statustext' =>
lang('Enter any persentage addition per unit'),
'value_addition_percentage'
=> $values['addition_percentage'],
***************
*** 747,755 ****
'value_power_meter'
=> $project['power_meter'],
! 'lang_addition_rs'
=> lang('Rig adition'),
'lang_addition_rs_statustext' => lang('Enter
any round sum addition per order'),
'value_addition_rs'
=> $values['addition_rs'],
! 'lang_addition_percentage'
=> lang('Percentage adition'),
'lang_addition_percentage_statustext' =>
lang('Enter any persentage addition per unit'),
'value_addition_percentage'
=> $values['addition_percentage'],
--- 747,755 ----
'value_power_meter'
=> $project['power_meter'],
! 'lang_addition_rs'
=> lang('Rig addition'),
'lang_addition_rs_statustext' => lang('Enter
any round sum addition per order'),
'value_addition_rs'
=> $values['addition_rs'],
! 'lang_addition_percentage'
=> lang('Percentage addition'),
'lang_addition_percentage_statustext' =>
lang('Enter any persentage addition per unit'),
'value_addition_percentage'
=> $values['addition_percentage'],
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uidrawing.inc.php 23 May 2003 08:40:19 -0000 1.19
--- class.uidrawing.inc.php 12 Jun 2003 20:51:13 -0000 1.20
***************
*** 179,183 ****
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index'),
! 'lang_history_statustext' =>
lang('searh for history at this location'),
'lang_select'
=> lang('select'),
'links'
=> $links,
--- 179,183 ----
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index'),
! 'lang_history_statustext' =>
lang('search for history at this location'),
'lang_select'
=> lang('select'),
'links'
=> $links,
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uirequest.inc.php 26 May 2003 18:18:17 -0000 1.17
--- class.uirequest.inc.php 12 Jun 2003 20:51:13 -0000 1.18
***************
*** 210,214 ****
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.index&project_id='
. $project_id),
! 'lang_history_statustext'
=> lang('searh for history at this location'),
'lang_select'
=> lang('select'),
--- 210,214 ----
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.index&project_id='
. $project_id),
! 'lang_history_statustext'
=> lang('search for history at this location'),
'lang_select'
=> lang('select'),
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uidocument.inc.php 23 May 2003 08:40:19 -0000 1.9
--- class.uidocument.inc.php 12 Jun 2003 20:51:13 -0000 1.10
***************
*** 184,188 ****
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&cat_id='
. $this->cat_id),
! 'lang_history_statustext' =>
lang('searh for history at this location'),
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
--- 184,188 ----
(
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&cat_id='
. $this->cat_id),
! 'lang_history_statustext' =>
lang('search for history at this location'),
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
***************
*** 355,359 ****
'location_data'
=> $location_data,
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&cat_id='
. $this->cat_id),
! 'lang_history_statustext' =>
lang('searh for history at this location'),
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
--- 355,359 ----
'location_data'
=> $location_data,
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&cat_id='
. $this->cat_id),
! 'lang_history_statustext' =>
lang('search for history at this location'),
'lang_select'
=> lang('select'),
'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uiinvestment.inc.php 23 May 2003 08:40:19 -0000 1.19
--- class.uiinvestment.inc.php 12 Jun 2003 20:51:13 -0000 1.20
***************
*** 486,490 ****
if(!$values['initial_value'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please set a inital value
!'));
}
--- 486,490 ----
if(!$values['initial_value'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please set a initial value
!'));
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.uiinvoice.inc.php,1.25,1.26 class.uiwo_hour.inc.php,1.25,1.26 class.uiproject.inc.php,1.23,1.24 class.uiworkorder.inc.php,1.21,1.22 class.uidrawing.inc.php,1.19,1.20 class.uirequest.inc.php,1.17,1.18 class.uidocument.inc.php,1.9,1.10class.uiinvestment.inc.php,1.19,1.20,
Guillaume Courtois <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup phpgw_fr.lang,1.5,1.6 phpgw_en.lang,1.8,1.9 phpgw_no.lang,1.6,1.7
- Next by Date:
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.13,1.42.2.5.2.14 class.soprojecthours.inc.php,1.8.4.4,1.8.4.5 class.uiprojecthours.inc.php,1.22.2.5.2.6,1.22.2.5.2.7 class.uiprojects.inc.php,1.47.2.7.2.12,1.47.2.7.2.13
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup phpgw_fr.lang,1.5,1.6 phpgw_en.lang,1.8,1.9 phpgw_no.lang,1.6,1.7
- Next by thread:
[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.13,1.42.2.5.2.14 class.soprojecthours.inc.php,1.8.4.4,1.8.4.5 class.uiprojecthours.inc.php,1.22.2.5.2.6,1.22.2.5.2.7 class.uiprojects.inc.php,1.47.2.7.2.12,1.47.2.7.2.13
- Index(es):