[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9418] Merge 9415:9417 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9418] Merge 9415:9417 from trunk |
|
Date: |
Tue, 22 May 2012 07:05:46 +0000 |
Revision: 9418
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9418
Author: sigurdne
Date: 2012-05-22 07:05:44 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Merge 9415:9417 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/js/yahoo/project.edit.js
branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-1_0-branch/rental/templates/base/contract.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,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414
+
/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,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417
Modified: branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2012-05-22 07:05:44 UTC (rev 9418)
@@ -415,11 +415,15 @@
$values['godkjentbelop'] = $values['amount'];
$_dateformat = $this->bocommon->dateformat;
-
- $values['fakturadato'] =
date($_dateformat,phpgwapi_datetime::date_to_timestamp($values['invoice_date']));
- $values['forfallsdato'] =
date($_dateformat,phpgwapi_datetime::date_to_timestamp($values['payment_date']));
- $values['periode'] =
date('Ym',phpgwapi_datetime::date_to_timestamp($values['paid_date']));
+ $invoice_date = $values['invoice_date'] ?
phpgwapi_datetime::date_to_timestamp($values['invoice_date']) : time();
+ $payment_date = $values['payment_date'] ?
phpgwapi_datetime::date_to_timestamp($values['payment_date']) : time();
+ $paid_date = $values['paid_date'] ?
phpgwapi_datetime::date_to_timestamp($values['paid_date']) : time();
+
+ $values['fakturadato'] = date($_dateformat,
$invoice_date);
+ $values['forfallsdato'] = date($_dateformat,
$payment_date);
+ $values['periode'] = date('Ym',
$paid_date);
+
$values['kildeid'] = 1;
$values['pmwrkord_code'] = $values['order_id'];
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-22 07:05:44 UTC (rev 9418)
@@ -557,6 +557,7 @@
$sql = "SELECT DISTINCT
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,sum(belop) as belop,
sum(godkjentbelop) as godkjentbelop,"
. " currency,budsjettansvarligid,org_name"
. " FROM $table"
+ . " {$this->join} fm_ecoart ON fm_ecoart.id =
$table.artid"
. " {$this->join} fm_workorder ON
fm_workorder.id = $table.pmwrkord_code"
. " {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id"
. " {$this->join} fm_vendor ON
{$table}.spvend_code = fm_vendor.id {$filtermethod} {$groupmethod}";
@@ -583,11 +584,15 @@
foreach ($values as &$entry)
{
- $sql = "SELECT budsjettsigndato{$overftid} FROM
$table WHERE pmwrkord_code = '{$entry['workorder_id']}' AND bilagsnr =
'{$entry['voucher_id']}' AND fakturanr = '{$entry['invoice_id']}'";
+ $sql = "SELECT
budsjettsigndato{$overftid},fm_ecoart.descr as type"
+ . " FROM {$table} {$this->join} fm_ecoart ON
fm_ecoart.id = $table.artid"
+ . " WHERE pmwrkord_code =
'{$entry['workorder_id']}' AND bilagsnr = '{$entry['voucher_id']}' AND
fakturanr = '{$entry['invoice_id']}'";
+
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$entry['budsjettsigndato'] =
$this->db->f('budsjettsigndato');
$entry['transfer_time'] =
$this->db->f('overftid');
+ $entry['type'] =
$this->db->f('type');
}
return $values;
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-05-22 07:05:44 UTC (rev 9418)
@@ -1746,6 +1746,7 @@
'dima'
=> $entry['dima'],
'dimb'
=> $entry['dimb'],
'dimd'
=> $entry['dimd'],
+ 'type'
=> $entry['type'],
'amount'
=> $entry['amount'],
'approved_amount' =>
$entry['approved_amount'],
'vendor'
=> $entry['vendor'],
@@ -1781,6 +1782,7 @@
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'approved_amount','label'=>lang('approved
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'type','label'=>lang('type'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budsjettsigndato','label'=>lang('budsjettsigndato'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'transfer_time','label'=>lang('transfer
time'),'sortable'=>false,'resizeable'=>true),
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-05-22 07:05:44 UTC (rev 9418)
@@ -1650,6 +1650,7 @@
'dima'
=> $entry['dima'],
'dimb'
=> $entry['dimb'],
'dimd'
=> $entry['dimd'],
+ 'type'
=> $entry['type'],
'amount'
=> $entry['amount'],
'approved_amount' =>
$entry['approved_amount'],
'vendor'
=> $entry['vendor'],
@@ -1690,6 +1691,7 @@
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'approved_amount','label'=>lang('approved
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'type','label'=>lang('type'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budsjettsigndato','label'=>lang('budsjettsigndato'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'transfer_time','label'=>lang('transfer
time'),'sortable'=>false,'resizeable'=>true),
Modified: branches/Version-1_0-branch/property/js/yahoo/project.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/property/js/yahoo/project.edit.js
2012-05-22 07:05:44 UTC (rev 9418)
@@ -180,7 +180,7 @@
td_empty(4);
td_sum(tmp_sum1);
td_sum(tmp_sum2);
- td_empty(4);
+ td_empty(5);
myfoot = tableYUI2.createTFoot();
myfoot.setAttribute("id","myfoot");
Modified: branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
2012-05-22 07:05:44 UTC (rev 9418)
@@ -115,7 +115,7 @@
td_empty(3);
td_sum(tmp_sum1);
td_sum(tmp_sum2);
- td_empty(4);
+ td_empty(5);
myfoot = tableYUI.createTFoot();
myfoot.setAttribute("id","myfoot");
Modified: branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/rental/inc/class.bofellesdata.inc.php
2012-05-22 07:05:44 UTC (rev 9418)
@@ -386,7 +386,7 @@
if($db->next_record())
{
- return $db->f('count(*)');
+ return $db->f('count');
}
return 0;
}
Modified: branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2012-05-22 07:05:44 UTC (rev 9418)
@@ -399,6 +399,8 @@
else
{
if($this->isAdministrator() ||
$this->isExecutiveOfficer()){
+ $created = strtotime('now');
+ $created_by =
$GLOBALS['phpgw_info']['user']['account_id'];
if(!isset($contract)){
$contract = new
rental_contract();
$fields =
rental_socontract::get_instance()->get_fields_of_responsibility();
@@ -410,6 +412,8 @@
(
'contract' =>
$contract,
'notification' =>
$notification,
+ 'created' => $created,
+ 'created_by' =>
$created_by,
'editable' => true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
'error' =>
isset($error) ? $error : phpgw::get_var('error'),
Modified: branches/Version-1_0-branch/rental/templates/base/contract.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/contract.php
2012-05-21 18:05:05 UTC (rev 9417)
+++ branches/Version-1_0-branch/rental/templates/base/contract.php
2012-05-22 07:05:44 UTC (rev 9418)
@@ -48,11 +48,22 @@
<br/>
<label><?php echo lang('last_updated') ?> </label>
<?php
- echo
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_last_updated());
+ if($contract->get_id() > 0) {
+ echo
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_last_updated());
+ }
+ else{
+ echo
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$created);
+ }
?>
<label> <?php echo lang('name') ?></label>
<?php
- echo $contract->get_last_edited_by();
+ if($contract->get_id() > 0) {
+ echo $contract->get_last_edited_by();
+ }
+ else
+ {
+ echo
$GLOBALS['phpgw']->accounts->id2name($created_by);
+ }
?>
<br/>
<label><?php echo lang('composite') ?> </label>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9418] Merge 9415:9417 from trunk,
Sigurd Nes <=