[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8967] Merge 8965:8966 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8967] Merge 8965:8966 from trunk |
|
Date: |
Tue, 06 Mar 2012 13:03:46 +0000 |
Revision: 8967
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8967
Author: sigurdne
Date: 2012-03-06 13:03:46 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Merge 8965:8966 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966
Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2012-03-06 13:02:46 UTC (rev 8966)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2012-03-06 13:03:46 UTC (rev 8967)
@@ -285,13 +285,12 @@
'budget_id' =>
$this->db->f('id'),
'year' =>
$this->db->f('year'),
'grouping' =>
$this->db->f('b_group'),
- 'district_id' =>
$this->db->f('district_id'),
+ 'district_id' =>
$this->db->f('district_id'),
'revision' =>
$this->db->f('revision'),
- 'budget_cost' =>
$this->db->f('budget_cost'),
- 'entry_date' =>
$this->db->f('entry_date'),
- 'ecodimb'
=> $this->db->f('ecodimb'),
- 'cat_id'
=> $this->db->f('category'),
- // 'user'
=> $GLOBALS['phpgw']->accounts->id2name($this->db->f('user_id'))
+ 'budget_cost' =>
$this->db->f('budget_cost'),
+ 'entry_date' =>
$this->db->f('entry_date'),
+ 'ecodimb' =>
$this->db->f('ecodimb'),
+ 'cat_id' =>
$this->db->f('category'),
);
}
return $budget;
@@ -797,20 +796,29 @@
$start_periode = date('Ym',mktime(2,0,0,1,1,$year));
$end_periode = date('Ym',mktime(2,0,0,12,31,$year));
- $sql = "SELECT fm_b_account.{$b_account_field} as
{$b_account_field}, district_id, sum(godkjentbelop) as actual_cost,dimb FROM
fm_ecobilagoverf"
+ $this->db->query('SELECT id, percent FROM
fm_ecomva',__LINE__,__FILE__);
+ $_taxcode = array(0 => 0);
+ while ($this->db->next_record())
+ {
+ $_taxcode[$this->db->f('id')] =
$this->db->f('percent');
+ }
+
+ $sql = "SELECT fm_b_account.{$b_account_field} as
{$b_account_field}, district_id, sum(godkjentbelop) as actual_cost,dimb,mvakode"
+ . " FROM fm_ecobilagoverf"
. " {$this->join} fm_b_account ON
fm_ecobilagoverf.spbudact_code =fm_b_account.id"
. " {$this->join} fm_location1 ON
fm_ecobilagoverf.loc1 = fm_location1.loc1"
. " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id"
. " {$this->join} fm_workorder ON
fm_ecobilagoverf.pmwrkord_code = fm_workorder.id"
. " {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id"
. " WHERE periode >= $start_periode AND periode
<= $end_periode {$filtermethod}"
- . " GROUP BY fm_b_account.{$b_account_field},
district_id,dimb";
+ . " GROUP BY fm_b_account.{$b_account_field},
district_id, dimb, mvakode";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
- $_actual_cost =
round($this->db->f('actual_cost'));
+ $_taxfactor = 1 +
($_taxcode[(int)$this->db->f('mvakode')]/100);
+ $_actual_cost =
round($this->db->f('actual_cost')/$_taxfactor);
$sum_actual_cost += $_actual_cost;
$actual_cost[$this->db->f($b_account_field)][(int)$this->db->f('district_id')][(int)$this->db->f('dimb')]
+= $_actual_cost;
$accout_info[$this->db->f($b_account_field)] =
true;
@@ -818,10 +826,8 @@
$ecodimb[(int)$this->db->f('dimb')] = true;
}
-
// start service agreements
-
$filtermethod = " fm_s_agreement_budget.year = $year";
$where = 'AND';
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2012-03-06 13:02:46 UTC (rev 8966)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2012-03-06 13:03:46 UTC (rev 8967)
@@ -523,6 +523,12 @@
(
array
(
+ 'name' =>
'percent',
+ 'descr' =>
lang('percent'),
+ 'type' => 'int'
+ ),
+ array
+ (
'name' =>
'descr',
'descr' =>
lang('descr'),
'type' =>
'varchar'
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2012-03-06 13:02:46 UTC (rev 8966)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2012-03-06 13:03:46 UTC (rev 8967)
@@ -456,7 +456,7 @@
'lang_edit' =>
lang('edit'),
'lang_delete' =>
lang('delete'),
'lang_category' =>
lang('category'),
- 'lang_per_cent' => lang('Per
Cent'),
+ 'lang_per_cent' =>
lang('percent'),
);
$tax = $this->config->config_data['fm_tax'];
@@ -836,7 +836,7 @@
$uicols = array (
'name' =>
array('hour_id','post','code','hours_descr','unit','billperae','quantity','cost','deviation','result','wo_hour_category','cat_per_cent'),
'input_type' =>
array('hidden','text','text','text','text','text','text','text','text','text','text','text'),
- 'descr' =>
array('',lang('Post'),lang('Code'),lang('Descr'),lang('Unit'),lang('Bill per
unit'),lang('Quantity'),lang('Cost'),lang('deviation'),lang('result'),lang('Category'),lang('Per
Cent')),
+ 'descr' =>
array('',lang('Post'),lang('Code'),lang('Descr'),lang('Unit'),lang('Bill per
unit'),lang('Quantity'),lang('Cost'),lang('deviation'),lang('result'),lang('Category'),lang('percent')),
'className' =>
array('','','','','','rightClasss','rightClasss','rightClasss','rightClasss','rightClasss','','rightClasss')
);
@@ -2211,7 +2211,7 @@
'type' =>
array('','','','','','','','','','','','text','',''),
'name' =>
array('activity_id','num','branch','vendor_id','descr','base_descr','unit','w_cost','m_cost','total_cost','this_index','quantity','wo_hour_cat','cat_per_cent'),
'formatter' =>
array('','','','','','','','','','','','','',''),
- 'descr' =>
array('',lang('Activity
Num'),lang('Branch'),lang('Vendor'),lang('Description'),lang('Base'),lang('Unit'),lang('Labour
cost'),lang('Material cost'),lang('Total
Cost'),'',lang('Quantity'),lang('category'),lang('Per Cent')),
+ 'descr' =>
array('',lang('Activity
Num'),lang('Branch'),lang('Vendor'),lang('Description'),lang('Base'),lang('Unit'),lang('Labour
cost'),lang('Material cost'),lang('Total
Cost'),'',lang('Quantity'),lang('category'),lang('percent')),
'className' =>
array('','','','','','','','rightClasss','rightClasss','rightClasss','','','','')
);
@@ -2313,7 +2313,7 @@
$uicols_details = array (
'name' =>
array('hour_id','post','code','hours_descr','unit','billperae','quantity','cost','deviation','result','wo_hour_category','cat_per_cent'),
'input_type' =>
array('hidden','text','text','text','text','text','text','text','text','text','text','text'),
- 'descr' =>
array('',lang('Post'),lang('Code'),lang('Descr'),lang('Unit'),lang('Bill per
unit'),lang('Quantity'),lang('Cost'),lang('deviation'),lang('result'),lang('Category'),lang('Per
Cent')),
+ 'descr' =>
array('',lang('Post'),lang('Code'),lang('Descr'),lang('Unit'),lang('Bill per
unit'),lang('Quantity'),lang('Cost'),lang('deviation'),lang('result'),lang('Category'),lang('percent')),
'className' =>
array('','','','','','rightClasss','rightClasss','rightClasss','rightClasss','rightClasss','','rightClasss')
);
@@ -2834,7 +2834,7 @@
$uicols_details = array (
'name' =>
array('hour_id','post','code','hours_descr','unit','billperae','quantity','cost','deviation','result','wo_hour_category','cat_per_cent'),
'input_type' =>
array('hidden','text','text','text','text','text','text','text','text','text','text','text'),
- 'descr' =>
array('',lang('Post'),lang('Code'),lang('Descr'),lang('Unit'),lang('Bill per
unit'),lang('Quantity'),lang('Cost'),lang('deviation'),lang('result'),lang('Category'),lang('Per
Cent')),
+ 'descr' =>
array('',lang('Post'),lang('Code'),lang('Descr'),lang('Unit'),lang('Bill per
unit'),lang('Quantity'),lang('Cost'),lang('deviation'),lang('result'),lang('Category'),lang('percent')),
'className' =>
array('','','','','','rightClasss','rightClasss','rightClasss','rightClasss','rightClasss','','rightClasss')
);
@@ -3254,7 +3254,7 @@
'wo_hour_cat_list'
=>
$this->bocommon->select_category_list(array('format'=>'select','selected' =>
$values['wo_hour_cat'],'type' =>'wo_hours','order'=>'id')),
'lang_cat_per_cent_statustext' =>
lang('the percentage of the category'),
'value_cat_per_cent'
=> $values['cat_per_cent'],
- 'lang_per_cent'
=> lang('Per Cent')
+ 'lang_per_cent'
=> lang('percent')
);
//_debug_array($data);
$appname = lang('Workorder');
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-03-06
13:02:46 UTC (rev 8966)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-03-06
13:03:46 UTC (rev 8967)
@@ -11,7 +11,7 @@
accounting categories property no Kategorier regnskap
accounting dim b property no Kostnadssted
accounting dim d property no Regnskap dim d
-accounting tax property no Regnskap skatter
+accounting tax property no Regnskap mva-kode
accounting voucher category property no Regnskap kategorier
faktura
accounting voucher type property no Regnskap type faktura
acl_locastion is missing property no ACL-lokalisering mangler
@@ -1161,7 +1161,7 @@
payment date property no Forfallsdato
pdf property no PDF
per agreement property no pr avtale
-per cent property no Prosent
+percent property no Prosent
percentage addition property no prosentvis tillegg
performed property no Utført
period property no Periode
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2012-03-06
13:02:46 UTC (rev 8966)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.635';
+ $setup_info['property']['version'] = '0.9.17.636';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-03-06 13:02:46 UTC (rev 8966)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-03-06 13:03:46 UTC (rev 8967)
@@ -1183,6 +1183,7 @@
'fm_ecomva' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
+ 'percent' => array('type' => 'int','precision'
=> '4','nullable' => True),
'descr' => array('type' =>
'varchar','precision' => '25','nullable' => False)
),
'pk' => array('id'),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-03-06 13:02:46 UTC (rev 8966)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-03-06 13:03:46 UTC (rev 8967)
@@ -6004,6 +6004,26 @@
}
/**
+ * Update property version from 0.9.17.635 to 0.9.17.636
+ * Add percent value to tax-code
+ *
+ */
+ $test[] = '0.9.17.635';
+ function property_upgrade0_9_17_635()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecomva','percent',array('type' =>
'int','precision' => 4,'nullable' => True));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.636';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
+
+ /**
* Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
*
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8967] Merge 8965:8966 from trunk,
Sigurd Nes <=