[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9216] Merge 9212:9215 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9216] Merge 9212:9215 from trunk |
|
Date: |
Tue, 24 Apr 2012 09:32:19 +0000 |
Revision: 9216
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9216
Author: sigurdne
Date: 2012-04-24 09:32:18 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Merge 9212:9215 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.soXport.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
branches/Version-1_0-branch/property/js/yahoo/invoice2.index.js
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
branches/Version-1_0-branch/property/templates/base/config.tpl
branches/Version-1_0-branch/property/templates/base/invoice2.xsl
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
+
/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
Modified: branches/Version-1_0-branch/property/inc/class.soXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2012-04-24 09:32:18 UTC (rev 9216)
@@ -256,6 +256,7 @@
$fields['loc1'],
$fields['dima'],
$fields['dimd'],
+ $fields['dime'],
$fields['mvakode'],
$fields['periode'],
$this->db->db_addslashes($fields['merknad']),
@@ -276,7 +277,7 @@
$sql= "INSERT INTO fm_ecobilag
(project_id,kostra_id,pmwrkord_code,bilagsnr,bilagsnr_ut,splitt,kildeid,kidnr,typeid,fakturadato,"
. "
forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
- . "
fakturanr,spbudact_code,loc1,dima,dimd,mvakode,periode,merknad,line_text,oppsynsigndato,saksigndato,"
+ . "
fakturanr,spbudact_code,loc1,dima,dimd,dime,mvakode,periode,merknad,line_text,oppsynsigndato,saksigndato,"
. "
budsjettsigndato,utbetalingsigndato,item_type,item_id,external_ref,currency,belop,godkjentbelop)"
. " VALUES ({$values}," .
$this->db->money_format($fields['belop']) . ',' .
$this->db->money_format($fields['godkjentbelop']) .')';
@@ -330,6 +331,7 @@
$data['dimb'],
$data['mvakode'],
$data['dimd'],
+ $data['dime'],
$data['oppsynsmannid'],
$data['saksbehandlerid'],
$data['budsjettansvarligid'],
@@ -354,7 +356,7 @@
$sql="INSERT INTO fm_ecobilagoverf
(id,bilagsnr,bilagsnr_ut,kidnr,typeid,kildeid,project_id,kostra_id,pmwrkord_code,fakturadato,"
. "
periode,periodization,periodization_start,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
- . "
dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
+ . "
dimb,mvakode,dimd,dime,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
. "
budsjettsigndato,merknad,line_text,splitt,utbetalingid,utbetalingsigndato,filnavn,overftid,item_type,item_id,external_ref,"
. "
currency,manual_record,belop,godkjentbelop,ordrebelop)"
. "VALUES ($values, "
@@ -421,6 +423,7 @@
'dimb'
=> $this->db->f('dimb'),
'mvakode'
=> $this->db->f('mvakode'),
'dimd'
=> $this->db->f('dimd'),
+ 'dime'
=> $this->db->f('dime'),
'oppsynsmannid' =>
$this->db->f('oppsynsmannid'),
'saksbehandlerid' =>
$this->db->f('saksbehandlerid'),
'budsjettansvarligid' =>
$this->db->f('budsjettansvarligid'),
@@ -521,6 +524,7 @@
$hoved_bilag[$i]['dimb']
= $this->db->f('dimb');
$hoved_bilag[$i]['mvakode']
= $this->db->f('mvakode');
$hoved_bilag[$i]['dimd']
= $this->db->f('dimd');
+ $hoved_bilag[$i]['dime']
= $this->db->f('dime');
if($this->db->f('oppsynsmannid'))
{
$hoved_bilag[$i]['oppsynsmannid'] = $this->db->f('oppsynsmannid');
@@ -587,6 +591,7 @@
$underbilag[$i]['dimb'] = $this->db->f('dimb');
$underbilag[$i]['mvakode'] =
$this->db->f('mvakode');
$underbilag[$i]['dimd'] = $this->db->f('dimd');
+ $underbilag[$i]['dime'] = $this->db->f('dime');
$underbilag[$i]['project_id'] =
$this->db->f('project_id');
$underbilag[$i]['kostra_id'] =
$this->db->f('kostra_id');
if($this->db->f('oppsynsmannid'))
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-04-24 09:32:18 UTC (rev 9216)
@@ -472,6 +472,7 @@
'dima'
=> $this->db->f('dima'),
'dimb'
=> $this->db->f('dimb'),
'dimd'
=> $this->db->f('dimd'),
+ 'dime'
=> $this->db->f('dime'),
'remark'
=> !!$this->db->f('merknad'),
'tax_code'
=> $this->db->f('mvakode'),
'amount'
=> $this->db->f('belop'),
@@ -1304,6 +1305,7 @@
'dim_a'
=> $this->db->f('dima'),
'dim_b'
=> $this->db->f('dimb'),
'dim_d'
=> $this->db->f('dimd'),
+ 'dim_e'
=> $this->db->f('dime'),
'tax_code'
=> $this->db->f('mvakode'),
'invoice_id'
=> $this->db->f('fakturanr'),
'kid_nr'
=> $this->db->f('kidnr'),
@@ -1874,6 +1876,7 @@
$value_set_line['pmwrkord_code'] =
$data['order_id'];
$value_set_line['dimb'] =
$data['dim_b'];
$value_set_line['dima'] =
$data['dim_a'];
+ $value_set_line['dime'] =
$data['dim_e'];
$value_set_line['mvakode'] =
$data['tax_code'];
$value_set_line['project_id'] =
$data['project_group'];
$value_set_line['spbudact_code'] =
$data['b_account_id'];
@@ -1938,7 +1941,7 @@
$value_set = array();
- $skip_values =
array('id','pmwrkord_code', 'spbudact_code', 'dima', 'dimb', 'loc1', 'mvakode',
'dimd', 'merknad',
'line_text','oppsynsmannid','saksbehandlerid','oppsynsigndato','saksigndato','budsjettsigndato');
+ $skip_values =
array('id','pmwrkord_code', 'spbudact_code', 'dima', 'dimb', 'dime', 'loc1',
'mvakode', 'dimd', 'merknad',
'line_text','oppsynsmannid','saksbehandlerid','oppsynsigndato','saksigndato','budsjettsigndato');
foreach($metadata as $_field)
{
if(!in_array($_field->name,
$skip_values))
Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
2012-04-24 09:32:18 UTC (rev 9216)
@@ -306,6 +306,13 @@
),
array
(
+ 'key' => 'dime',
+ 'label' => lang('dime'),
+ 'sortable' => false,
+ 'formatter' => 'FormatterRight',
+ ),
+ array
+ (
'key' => 'project_group',
'label' => lang('project group'),
'sortable' => false,
@@ -417,6 +424,12 @@
$entry['split'] = "<input type =\"text\"
name=\"values[split_amount][{$entry['id']}]\" value=\"\" size=\"8\">";
$entry['approved_amount_hidden'] =
$entry['approved_amount'];
$entry['approved_amount'] = "<input type
=\"text\" name=\"values[approved_amount][{$entry['id']}]\"
value=\"{$entry['approved_amount']}\" size=\"8\">";
+ if($entry['dime'])
+ {
+ $catetory =
execMethod('phpgwapi.categories.return_single',$entry['dime']);
+ $entry['dime'] = $catetory[0]['name'];
+ }
+
$results['results'][]= $entry;
}
@@ -492,6 +505,7 @@
$sign_orig = '';
$my_initials =
$GLOBALS['phpgw_info']['user']['account_lid'];
+
if(count($voucher))
{
@@ -587,7 +601,7 @@
foreach ($voucher as $line)
{
$voucher_info['generic']['approved_amount'] += $line['approved_amount'];
- $voucher_info['generic']['amount'] +=
$line['amount'];
+ $voucher_info['generic']['amount'] +=
$line['amount'];
}
$voucher_info['generic']['approved_amount'] =
number_format($voucher_info['generic']['approved_amount'], 2, ',', ' ');
@@ -628,6 +642,7 @@
}
$voucher_info['generic']['process_log'] =
$voucher[0]['process_log'];
$voucher[0]['image_url'] =
'';//'http://www.nettavisen.no/';
+
}
else
{
@@ -652,6 +667,17 @@
);
}
+ $cats = CreateObject('phpgwapi.categories', -1,
'property', '.project');
+ $cats->supress_info = true;
+
+ $categories =
$cats->formatted_xslt_list(array('selected' => isset($voucher[0]['dime']) &&
$voucher[0]['dime'] ? $voucher[0]['dime'] : 0));
+
+ foreach($categories['cat_list'] as &$cat)
+ {
+ $cat['id'] = $cat['cat_id'];
+ $cat['selected'] = $cat['selected'] ? 1 : 0;
+ }
+ $voucher_info['generic']['dime_list'] = array('options'
=> $categories['cat_list']);
$voucher_info['generic']['approved_list'] =
$approved_list;
$voucher_info['generic']['process_code_list'] =
array('options' => execMethod('property.bogeneric.get_list', array(
'type' => 'voucher_process_code',
@@ -659,11 +685,13 @@
array_unshift
($voucher_info['generic']['process_code_list']['options'],array
('id'=>'','name'=>lang('select')));
array_unshift
($voucher_info['generic']['dimb_list']['options'],array
('id'=>'','name'=>lang('select')));
+ array_unshift
($voucher_info['generic']['dime_list']['options'],array
('id'=>'','name'=>lang('select')));
array_unshift
($voucher_info['generic']['periodization_list']['options'],array('id' => '',
'name' => lang('none')));
$voucher_info['voucher'] = $voucher;
$voucher_info['generic']['sign_orig'] = $sign_orig;
$voucher_info['generic']['my_initials'] = $my_initials;
+
//_debug_array($voucher_info);die();
return $voucher_info;
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-04-24 09:32:18 UTC (rev 9216)
@@ -1152,10 +1152,13 @@
$error_id=true;
}
- if(!$values['cat_id'])
+
if(!isset($config->config_data['project_optional_category']) ||
!$config->config_data['project_optional_category'])
{
-
$receipt['error'][]=array('msg'=>lang('Please select a category !'));
- $error_id=true;
+ if(!$values['cat_id'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select a category !'));
+ $error_id=true;
+ }
}
if(!$values['coordinator'])
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-04-24 07:26:04 UTC (rev 9215)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-04-24 09:32:18 UTC (rev 9216)
@@ -566,8 +566,9 @@
$buffer[$i]['bilagsnr_ut'] =
$bilagsnr_ut;
$buffer[$i]['referanse'] =
"ordre: {$order_id}";
+ $buffer[$i]['dima'] =
$order_info['dima'];
$buffer[$i]['dimb'] =
$order_info['dimb'];
- $buffer[$i]['dima'] =
$order_info['dima'];
+ $buffer[$i]['dime'] =
$order_info['dime'];
$buffer[$i]['loc1'] =
$order_info['loc1'];
$buffer[$i]['line_text'] =
$order_info['title'];
@@ -780,7 +781,7 @@
$order_info = array();
$toarray = array();
$order_id = (int) $order_id;
- $sql = "SELECT
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_workorder.ecodimb,
fm_workorder.user_id,fm_workorder.title"
+ $sql = "SELECT
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_workorder.ecodimb,fm_workorder.category,
fm_workorder.user_id,fm_workorder.title"
. " FROM fm_workorder {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id WHERE fm_workorder.id = {$order_id}";
$this->db->query($sql,__LINE__,__FILE__);
if( $this->db->next_record())
@@ -797,6 +798,7 @@
$order_info['vendor_id'] =
$this->db->f('vendor_id');
$order_info['spbudact_code'] =
$this->db->f('account_id');
$order_info['dimb']
= $this->db->f('ecodimb');
+ $order_info['dime']
= $this->db->f('category');
$order_info['title'] =
$this->db->f('title',true);
$janitor_user_id
= $this->db->f('user_id');
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-04-24 09:32:18 UTC (rev 9216)
@@ -275,6 +275,7 @@
'dimb'
=> $this->db->f('dimb'),
'mvakode'
=> $this->db->f('mvakode'),
'dimd'
=> $this->db->f('dimd'),
+ 'dime'
=> $this->db->f('dime'),
'project_id' =>
$this->db->f('project_id'),
'kostra_id'
=> $this->db->f('kostra_id'),
'item_type'
=> $this->db->f('item_type'),
@@ -330,6 +331,7 @@
$BilagOverf['dima'],
$BilagOverf['loc1'],
$BilagOverf['dimd'],
+ $BilagOverf['dime'],
$BilagOverf['mvakode'],
$BilagOverf['periode'],
$BilagOverf['periodization'],
@@ -353,7 +355,7 @@
$sql= "INSERT INTO fm_ecobilag
(project_id,kostra_id,pmwrkord_code,bilagsnr,bilagsnr_ut,splitt,kildeid,kidnr,typeid,"
. "
fakturadato,forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,"
- . "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,"
+ . "
saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,dime,mvakode,"
. "
periode,periodization,periodization_start,merknad,line_text,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,"
. "
item_type,item_id,external_ref,belop,godkjentbelop,currency)"
. " VALUES ({$values})";
@@ -743,6 +745,7 @@
$oRsOverfBilag['pmwrkord_code'] =
$line['order_id'];
$oRsOverfBilag['bilagsnr_ut'] = $bilagsnr_ut;
$oRsOverfBilag['periode'] =
$periode;
+ $dim6
= $line['dime'];
//Kopier verdier til fm_ecobilagoverf
if ($download=='on' && !$this->debug)
@@ -753,7 +756,10 @@
if ($line['order_id'])
{
$order_info =
$this->get_order_info($line['order_id']);
- $dim6 = isset($order_info['category'])
&& $order_info['category'] ? $order_info['category'] : '';
+ if(!$dim6)
+ {
+ $dim6 =
isset($order_info['category']) && $order_info['category'] ?
$order_info['category'] : '';
+ }
}
$descr = '';
Modified: branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
===================================================================
--- branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
2012-04-24 09:32:18 UTC (rev 9216)
@@ -204,6 +204,7 @@
$("#process_log").html( '' );
$("#dim_a").val('' );
$("#dim_b").html( "<option>Velg</option>" );
+ $("#dim_e").html( "<option>Velg</option>" );
$("#period").html( "<option>Velg</option>" );
$("#periodization").html( "<option>Velg</option>" );
$("#periodization_start").html( "<option>Velg</option>" );
@@ -215,6 +216,7 @@
$("#close_order").html( '' );
$("#close_order_orig").val( '' );
$("#park_order").html( '' );
+ $("#receipt").html('');
var voucher_id = $(this).val();
var oArgs = {menuaction:'property.uiinvoice2.get_first_line'};
@@ -243,10 +245,10 @@
});
$("#approve_line").live("click", function(e){
+ $("#receipt").html('');
var line_id = $(this).val();
var voucher_id_orig = $("#voucher_id").val();
update_form_values(line_id, voucher_id_orig);
-
});
@@ -458,6 +460,22 @@
$("#dim_b").html( htmlString );
}
+
if(typeof(data['generic']['dime_list']['options']) != 'undefined')
+ {
+ var htmlString = "";
+ var obj =
data['generic']['dime_list']['options'];
+
+ $.each(obj, function(i) {
+ var selected = '';
+ if(obj[i].id ==
voucher[0].dim_e)
+ {
+ selected = ' selected';
+ }
+ htmlString += "<option
value='" + obj[i].id + "'" + selected + ">" + obj[i].name + "</option>";
+ });
+
+ $("#dim_e").html( htmlString );
+ }
if(typeof(data['generic']['tax_code_list']['options']) != 'undefined')
{
var htmlString = "";
@@ -618,6 +636,7 @@
$("#process_log").html( '' );
$("#dim_a").val('' );
$("#dim_b").html( "<option>Velg</option>" );
+ $("#dim_e").html( "<option>Velg</option>" );
$("#period").html( "<option>Velg</option>" );
$("#periodization").html(
"<option>Velg</option>" );
$("#periodization_start").html(
"<option>Velg</option>" );
@@ -626,6 +645,7 @@
$("#approve_as").html( "<option>Velg</option>"
);
$("#order_text").html( 'Bestilling' );
$("#invoice_id_text").html('FakturaNr');
+ $("#receipt").html('');
document.getElementById('image_content').src =
'';
}
}
Modified: branches/Version-1_0-branch/property/js/yahoo/invoice2.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/invoice2.index.js
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/js/yahoo/invoice2.index.js
2012-04-24 09:32:18 UTC (rev 9216)
@@ -34,7 +34,7 @@
td_empty(1);
td_sum(tmp_sum1);
td_sum(tmp_sum2);
- td_empty(7);
+ td_empty(8);
myfoot = tableYUI.createTFoot();
myfoot.setAttribute("id","myfoot");
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-04-24
07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-04-24
09:32:18 UTC (rev 9216)
@@ -522,6 +522,7 @@
no authorities demands property no Ingen myndighetskrav
no dimb property no K Ikke valgt
dim d property no Dim D
+dime property no Kategori
directory created property no katalog er opprettet
disable property no Deaktiver
disabled property no inaktivt
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2012-04-24
07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2012-04-24
09:32:18 UTC (rev 9216)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.641';
+ $setup_info['property']['version'] = '0.9.17.642';
$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-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-04-24 09:32:18 UTC (rev 9216)
@@ -1055,6 +1055,7 @@
'dimb' => array('type' => 'int','precision' =>
'2','nullable' => True),
'mvakode' => array('type' => 'int','precision'
=> '2','nullable' => True),
'dimd' => array('type' => 'varchar','precision'
=> '5','nullable' => True),
+ 'dime' => array('type' => 'int','precision' =>
'4','nullable' => True),
'oppsynsmannid' => array('type' =>
'varchar','precision' => '12','nullable' => True),
'saksbehandlerid' => array('type' =>
'varchar','precision' => '12','nullable' => True),
'budsjettansvarligid' => array('type' =>
'varchar','precision' => '12','nullable' => False),
@@ -1108,6 +1109,7 @@
'dimb' => array('type' => 'int','precision' =>
'2','nullable' => True),
'mvakode' => array('type' => 'int','precision'
=> '2','nullable' => True),
'dimd' => array('type' => 'varchar','precision'
=> '5','nullable' => True),
+ 'dime' => array('type' => 'int','precision' =>
'4','nullable' => True),
'oppsynsmannid' => array('type' =>
'varchar','precision' => '12','nullable' => True),
'saksbehandlerid' => array('type' =>
'varchar','precision' => '12','nullable' => True),
'budsjettansvarligid' => array('type' =>
'varchar','precision' => '12','nullable' => False),
@@ -1357,7 +1359,7 @@
'name' => array('type' => 'varchar','precision'
=> '255','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
'access' => array('type' =>
'varchar','precision' => '7','nullable' => True),
- 'category' => array('type' => 'int','precision'
=> '4','nullable' => False),
+ 'category' => array('type' => 'int','precision'
=> '4','nullable' => true),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => False),
'start_date' => array('type' =>
'int','precision' => '4','nullable' => False),
'end_date' => array('type' => 'int','precision'
=> '4','nullable' => False),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-04-24 09:32:18 UTC (rev 9216)
@@ -6228,3 +6228,19 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+
+ $test[] = '0.9.17.641';
+ function property_upgrade0_9_17_641()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_project','category',array('type'
=> 'int', 'precision' => 4, 'nullable' => True, 'default' => '0'));
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilag','dime',
array('type' => 'int','precision' => 4,'nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_ecobilagoverf','dime',
array('type' => 'int','precision' => 4,'nullable' => True));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.642';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2012-04-24 09:32:18 UTC (rev 9216)
@@ -352,7 +352,15 @@
</select>
</td>
</tr>
-
+ <tr class="row_on">
+ <td>{lang_project_optional_category}.</td>
+ <td>
+ <select
name="newsettings[project_optional_category]">
+ <option value=""
{selected_project_optional_category_}>NO</option>
+ <option value="1"
{selected_project_optional_category_1}>YES</option>
+ </select>
+ </td>
+ </tr>
<tr class="row_off">
<td>{lang_request_show_dates}.</td>
<td>
Modified: branches/Version-1_0-branch/property/templates/base/invoice2.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/invoice2.xsl
2012-04-24 07:26:04 UTC (rev 9215)
+++ branches/Version-1_0-branch/property/templates/base/invoice2.xsl
2012-04-24 09:32:18 UTC (rev 9216)
@@ -26,6 +26,7 @@
//select { width: 200px; }
#voucher_id_filter { width: 800px; }
#dim_b { width: 200px; }
+#dim_e { width: 200px; }
#period { width: 200px; }
#periodization { width: 200px; }
#periodization_start { width: 200px; }
@@ -433,6 +434,16 @@
</tr>
<tr class ='row_off'>
<td>
+ <xsl:value-of select="php:function('lang',
'dime')" />
+ </td>
+ <td>
+ <select id="dim_e" name="values[dim_e]">
+ <xsl:apply-templates
select="voucher_info/generic/dime_list/options"/>
+ </select>
+ </td>
+ </tr>
+ <tr class ='row_off'>
+ <td>
<xsl:value-of select="php:function('lang',
'invoice line text')" />
</td>
<td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9216] Merge 9212:9215 from trunk,
Sigurd Nes <=