[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11767] Merge 11761:11766 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11767] Merge 11761:11766 from trunk |
|
Date: |
Fri, 28 Feb 2014 12:26:20 +0000 |
Revision: 11767
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11767
Author: sigurdne
Date: 2014-02-28 12:26:19 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Merge 11761:11766 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
branches/Version-1_0-branch/admin/templates/base/custom.xsl
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/export/default/Agresso_Bergen_Kostfordeling
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,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760
+
/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,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766
Modified: branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
2014-02-28 12:24:15 UTC (rev 11766)
+++ branches/Version-1_0-branch/admin/inc/class.ui_custom.inc.php
2014-02-28 12:26:19 UTC (rev 11767)
@@ -240,18 +240,6 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('custom'));
- if ( !isset($values['location']) )
- {
- if ( $location )
- {
- $values['location'] = $location;
- }
- else
- {
- $values['location'] = '';
- }
- }
-
if (isset($values['save']) && $values['save'])
{
if($id)
@@ -260,7 +248,8 @@
$action='edit';
}
- $values['appname']=$appname;
+ $values['appname']= $appname;
+ $values['location'] = $location;
if (!$values['location'])
{
@@ -367,9 +356,7 @@
$data = array
(
- 'lang_appname'
=> lang('appname'),
'appname'
=> $appname,
- 'lang_location'
=> lang('location'),
'lang_choice'
=> lang('Choice'),
'lang_new_value'
=> lang('New value'),
@@ -383,32 +370,24 @@
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'admin.ui_custom.list_attribute', 'appname'=> $appname, 'location'=>$location,
'menu_selection' => $GLOBALS['phpgw_info']['flags']['menu_selection'])),
- 'lang_id'
=> lang('Attribute ID'),
'lang_entity_type'
=> lang('Entity type'),
'lang_no_entity_type'
=> lang('No entity type'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'value_id'
=> $id,
- 'lang_column_name'
=> lang('Column name'),
'value_column_name'
=> (isset($values['column_name'])?$values['column_name']:''),
- 'lang_column_name_statustext' =>
lang('enter the name for the column'),
- 'lang_input_text'
=> lang('input text'),
'value_input_text'
=> (isset($values['input_text'])?$values['input_text']:''),
- 'lang_input_name_statustext' =>
lang('enter the input text for records'),
'lang_id_attribtext'
=> lang('Enter the attribute ID'),
'lang_entity_statustext'
=> lang('Select a entity type'),
- 'lang_statustext'
=> lang('Statustext'),
- 'lang_statustext_attribtext' =>
lang('Enter a statustext for the inputfield in forms'),
'value_statustext'
=> (isset($values['statustext'])?$values['statustext']:''),
'lang_done_attribtext'
=> lang('Back to the list'),
'lang_save_attribtext'
=> lang('Save the attribute'),
- 'lang_datatype'
=> lang('Datatype'),
'lang_datatype_statustext'
=> lang('Select a datatype'),
'lang_no_datatype'
=> lang('No datatype'),
'datatype_list'
=>
$this->bo->select_datatype((isset($values['column_info']['type'])?$values['column_info']['type']:'')),
Modified: branches/Version-1_0-branch/admin/templates/base/custom.xsl
===================================================================
--- branches/Version-1_0-branch/admin/templates/base/custom.xsl 2014-02-28
12:24:15 UTC (rev 11766)
+++ branches/Version-1_0-branch/admin/templates/base/custom.xsl 2014-02-28
12:26:19 UTC (rev 11767)
@@ -197,7 +197,7 @@
<tr>
<td class="th_text" align="left">
- <xsl:value-of select="lang_appname"/>
+ <xsl:value-of
select="php:function('lang', 'appname')" />
</td>
<td class="th_text" align="left">
<xsl:value-of select="appname"/>
@@ -206,12 +206,13 @@
<tr>
<td class="th_text" align="left">
<xsl:value-of select="lang_location"/>
+ <xsl:value-of
select="php:function('lang', 'location')" />
</td>
<td align="left">
<xsl:choose>
<xsl:when test="value_location
!= ''">
<xsl:value-of
select="value_location"/>
- <input type="hidden"
name="values[location]" value="{value_location}" />
+ <input type="hidden"
name="location" value="{value_location}" />
</xsl:when>
<xsl:otherwise>
<xsl:call-template
name="select_location"/>
@@ -223,7 +224,7 @@
<xsl:when test="value_id != ''">
<tr>
<td valign="top">
- <xsl:value-of
select="lang_id"/>
+ <xsl:value-of
select="php:function('lang', 'Attribute ID')" />
</td>
<td>
<xsl:value-of
select="value_id"/>
@@ -233,42 +234,36 @@
</xsl:choose>
<tr>
<td valign="top">
- <xsl:value-of
select="lang_column_name"/>
+ <xsl:value-of
select="php:function('lang', 'column name')" />
</td>
<td>
- <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="20"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_column_name_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="text"
name="values[column_name]" value="{value_column_name}" maxlength="20">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'enter the name for the column')" />
</xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of select="lang_input_text"/>
+ <xsl:value-of
select="php:function('lang', 'input text')" />
</td>
<td>
- <input type="text"
name="values[input_text]" value="{value_input_text}" maxlength="20"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_input_text_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
+ <input type="text"
name="values[input_text]" value="{value_input_text}" maxlength="20">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'enter the input text for records')" />
+ </xsl:attribute>
</input>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of select="lang_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'statustext')" />
</td>
<td>
- <textarea cols="60" rows="10"
name="values[statustext]" wrap="virtual" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_statustext_attribtext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <textarea cols="60" rows="10"
name="values[statustext]" wrap="virtual">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'Enter a statustext for the inputfield in forms')"
/>
</xsl:attribute>
<xsl:value-of
select="value_statustext"/>
</textarea>
@@ -293,11 +288,11 @@
</tr>
<tr>
<td valign="top">
- <xsl:value-of select="lang_datatype"/>
+ <xsl:value-of
select="php:function('lang', 'datatype')" />
</td>
<td valign="top">
<xsl:variable
name="lang_datatype_statustext"><xsl:value-of
select="lang_datatype_statustext"/></xsl:variable>
- <select
name="values[column_info][type]" class="forms"
onMouseover="window.status='{$lang_datatype_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="values[column_info][type]" class="forms">
<option value=""><xsl:value-of
select="lang_no_datatype"/></option>
<xsl:apply-templates
select="datatype_list"/>
</select>
@@ -308,11 +303,9 @@
<xsl:value-of select="lang_precision"/>
</td>
<td>
- <input type="text"
name="values[column_info][precision]" value="{value_precision}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_precision_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="text"
name="values[column_info][precision]" value="{value_precision}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_precision_statustext"/>
</xsl:attribute>
</input>
</td>
@@ -322,11 +315,9 @@
<xsl:value-of select="lang_scale"/>
</td>
<td>
- <input type="text"
name="values[column_info][scale]" value="{value_scale}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_scale_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="text"
name="values[column_info][scale]" value="{value_scale}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_scale_statustext"/>
</xsl:attribute>
</input>
</td>
@@ -336,11 +327,9 @@
<xsl:value-of select="lang_default"/>
</td>
<td>
- <input type="text"
name="values[column_info][default]" value="{value_default}"
onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_default_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="text"
name="values[column_info][default]" value="{value_default}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_default_statustext"/>
</xsl:attribute>
</input>
</td>
@@ -351,7 +340,7 @@
</td>
<td valign="top">
<xsl:variable
name="lang_nullable_statustext"><xsl:value-of
select="lang_nullable_statustext"/></xsl:variable>
- <select
name="values[column_info][nullable]" class="forms"
onMouseover="window.status='{$lang_nullable_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select
name="values[column_info][nullable]" class="forms">
<option value=""><xsl:value-of
select="lang_select_nullable"/></option>
<xsl:apply-templates
select="nullable_list"/>
</select>
@@ -365,19 +354,15 @@
<xsl:choose>
<xsl:when
test="value_list = 1">
<input
type="checkbox" name="values[list]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_list_statustext"/>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[list]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_list_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input
type="checkbox" name="values[list]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_list_statustext"/>
</xsl:attribute>
</input>
</xsl:otherwise>
@@ -391,20 +376,16 @@
<td>
<xsl:choose>
<xsl:when
test="value_search = 1">
- <input
type="checkbox" name="values[search]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input
type="checkbox" name="values[search]" value="1" checked="checked">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_include_search_statustext"/>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[search]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_include_search_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input
type="checkbox" name="values[search]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_include_search_statustext"/>
</xsl:attribute>
</input>
</xsl:otherwise>
@@ -418,20 +399,16 @@
<td>
<xsl:choose>
<xsl:when
test="value_history = 1">
- <input
type="checkbox" name="values[history]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_history_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input
type="checkbox" name="values[history]" value="1" checked="checked">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_history_statustext"/>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[history]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_history_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input
type="checkbox" name="values[history]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_history_statustext"/>
</xsl:attribute>
</input>
</xsl:otherwise>
@@ -445,20 +422,16 @@
<td>
<xsl:choose>
<xsl:when
test="value_disabled = 1">
- <input
type="checkbox" name="values[disabled]" value="1" checked="checked"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_disabled_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input
type="checkbox" name="values[disabled]" value="1" checked="checked">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_disabled_statustext"/>
</xsl:attribute>
</input>
</xsl:when>
<xsl:otherwise>
- <input
type="checkbox" name="values[disabled]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_disabled_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
+ <input
type="checkbox" name="values[disabled]" value="1">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_disabled_statustext"/>
</xsl:attribute>
</input>
</xsl:otherwise>
@@ -471,11 +444,9 @@
<xsl:value-of select="lang_helpmsg"/>
</td>
<td>
- <textarea cols="60" rows="10"
name="values[helpmsg]" wrap="virtual" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_helpmsg_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <textarea cols="60" rows="10"
name="values[helpmsg]" wrap="virtual">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_helpmsg_statustext"/>
</xsl:attribute>
<xsl:value-of
select="value_helpmsg"/>
</textarea>
@@ -497,11 +468,9 @@
<tr height="50">
<td>
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
- <input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_save_attribtext"/>
- <xsl:text>'; return
true;</xsl:text>
+ <input type="submit"
name="values[save]" value="{$lang_save}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_save_attribtext"/>
</xsl:attribute>
</input>
</td>
@@ -513,11 +482,9 @@
<xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
<xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
<form method="post"
action="{$done_action}">
- <input type="submit"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_done_attribtext"/>
- <xsl:text>';
return true;</xsl:text>
+ <input type="submit"
name="done" value="{$lang_done}">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="lang_done_attribtext"/>
</xsl:attribute>
</input>
</form>
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2014-02-28 12:24:15 UTC (rev 11766)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2014-02-28 12:26:19 UTC (rev 11767)
@@ -1710,8 +1710,11 @@
$historylog->add('RM', $project['id'],
$project['remark']);
}
+ /**
+ * Add budget to project if missing.
+ */
+ $this->_update_project_budget($project['id']);
-
$receipt['id'] = $project['id'];
$receipt['message'][] = array('msg' => lang('project
%1 has been edited', $project['id']));
@@ -3070,18 +3073,20 @@
$project_id = (int) $project_id;
$year = $year ? (int) $year :
date('Y');
$current_year = date('Y');
- $activate = true;
+ $activate = false;
- if($year < $current_year)
+ if($year == $current_year)
{
- $activate = false;
+ $activate = true;
}
$ids = array();
$this->db->query("SELECT id FROM fm_workorder WHERE
project_id = {$project_id}", __LINE__, __FILE__);
while($this->db->next_record())
{
- $ids[] = $this->db->f('id');
+ $id = $this->db->f('id');
+ $ids[] = $id;
+ phpgwapi_cache::system_clear('property',
"budget_order_{$id}");
}
$this->db->query("SELECT sum(budget) AS budget FROM
fm_workorder_budget WHERE year = {$year} AND order_id IN (" . implode(',',
$ids) . ')', __LINE__, __FILE__);
$this->db->next_record();
@@ -3104,6 +3109,8 @@
if($update)
{
+ $this->db->query("UPDATE fm_project_budget SET
active = 0 WHERE project_id = {$project_id} AND year != {$current_year}",
__LINE__, __FILE__);
+
$this->db->query("SELECT id, periodization_id
FROM fm_project WHERE id = {$project_id}", __LINE__, __FILE__);
if($this->db->next_record())
{
@@ -3114,4 +3121,28 @@
}
}
+ /**
+ * Add budget to project if missing.
+ * @param integer $project_id
+ */
+ protected function _update_project_budget($project_id)
+ {
+ $years = array();
+ $ids = array();
+ $this->db->query("SELECT id FROM fm_workorder WHERE
project_id = {$project_id}", __LINE__, __FILE__);
+ while($this->db->next_record())
+ {
+ $ids[] = $this->db->f('id');
+ }
+ $this->db->query("SELECT DISTINCT year FROM
fm_workorder_budget WHERE order_id IN (" . implode(',', $ids) . ')', __LINE__,
__FILE__);
+ while ($this->db->next_record())
+ {
+ $years[] = $this->db->f('year');
+ }
+ foreach($years as $_year)
+ {
+
$this->check_and_update_project_budget($project_id, $_year);
+ }
+ }
+
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2014-02-28 12:24:15 UTC (rev 11766)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2014-02-28 12:26:19 UTC (rev 11767)
@@ -1191,7 +1191,7 @@
$this->_update_order_budget($id,
$workorder['budget_year'], $periodization_id, $workorder['budget'],
$workorder['contract_sum'], $combined_cost);
}
- $this->_update_project_budget($workorder['project_id'],
date('Y', $workorder['start_date']));
+ $this->_update_project_budget($workorder['project_id']);
/*
if($workorder['charge_tenant'])
@@ -1416,7 +1416,7 @@
$historylog->add('B', $workorder['id'],
$new_budget, $old_budget);
}
- $this->_update_project_budget($workorder['project_id'],
date('Y', $workorder['start_date']));
+ $this->_update_project_budget($workorder['project_id']);
/* if($workorder['charge_tenant'])
{
@@ -2386,12 +2386,27 @@
/**
* Add budget to project if missing.
* @param integer $project_id
- * @param integer $year
*/
- protected function _update_project_budget($project_id, $year)
+ protected function _update_project_budget($project_id)
{
$soproject = CreateObject('property.soproject');
-
$soproject->check_and_update_project_budget($project_id, $year);
+
+ $years = array();
+ $ids = array();
+ $this->db->query("SELECT id FROM fm_workorder WHERE
project_id = {$project_id}", __LINE__, __FILE__);
+ while($this->db->next_record())
+ {
+ $ids[] = $this->db->f('id');
+ }
+ $this->db->query("SELECT DISTINCT year FROM
fm_workorder_budget WHERE order_id IN (" . implode(',', $ids) . ')', __LINE__,
__FILE__);
+ while ($this->db->next_record())
+ {
+ $years[] = $this->db->f('year');
+ }
+ foreach($years as $_year)
+ {
+
$soproject->check_and_update_project_budget($project_id, $_year);
+ }
}
/**
Modified:
branches/Version-1_0-branch/property/inc/export/default/Agresso_Bergen_Kostfordeling
===================================================================
---
branches/Version-1_0-branch/property/inc/export/default/Agresso_Bergen_Kostfordeling
2014-02-28 12:24:15 UTC (rev 11766)
+++
branches/Version-1_0-branch/property/inc/export/default/Agresso_Bergen_Kostfordeling
2014-02-28 12:26:19 UTC (rev 11767)
@@ -185,62 +185,50 @@
$sql = "SELECT * FROM fm_ecobilagoverf WHERE
filnavn='$Filnavn' and $datepart_year=$year and $datepart_month=$month and
$datepart_day= $day";
$this->db->query($sql, __LINE__, __FILE__);
- $i = 0;
+ $invoice_roleback = array();
+
while($this->db->next_record())
{
- $invoice_roleback[$i]['id']
= $this->db->f('id');
- $invoice_roleback[$i]['bilagsnr']
= $this->db->f('bilagsnr');
- $invoice_roleback[$i]['kidnr']
= $this->db->f('kidnr');
- $invoice_roleback[$i]['typeid']
= $this->db->f('typeid');
- $invoice_roleback[$i]['kildeid']
= $this->db->f('kildeid');
- $invoice_roleback[$i]['pmwrkord_code'] =
$this->db->f('pmwrkord_code');
- $invoice_roleback[$i]['belop']
= $this->db->f('belop');
- $invoice_roleback[$i]['fakturadato'] =
$this->db->f('fakturadato');
- $invoice_roleback[$i]['periode']
= $this->db->f('periode');
- $invoice_roleback[$i]['forfallsdato'] =
$this->db->f('forfallsdato');
- $invoice_roleback[$i]['fakturanr']
= $this->db->f('fakturanr');
- $invoice_roleback[$i]['spbudact_code'] =
$this->db->f('spbudact_code');
- $invoice_roleback[$i]['regtid']
= $this->db->f('regtid');
- $invoice_roleback[$i]['artid']
= $this->db->f('artid');
- $invoice_roleback[$i]['godkjentbelop'] =
$this->db->f('godkjentbelop');
- $invoice_roleback[$i]['spvend_code'] =
$this->db->f('spvend_code');
- $invoice_roleback[$i]['dima']
= $this->db->f('dima');
- $invoice_roleback[$i]['loc1']
= $this->db->f('loc1');
- $invoice_roleback[$i]['dimb']
= $this->db->f('dimb');
- $invoice_roleback[$i]['mvakode']
= $this->db->f('mvakode');
- $invoice_roleback[$i]['dimd']
= $this->db->f('dimd');
- $invoice_roleback[$i]['project_id']
= $this->db->f('project_id');
- $invoice_roleback[$i]['kostra_id']
= $this->db->f('kostra_id');
- $invoice_roleback[$i]['item_type']
= $this->db->f('item_type');
- $invoice_roleback[$i]['item_id']
= $this->db->f('item_id');
-
- if($this->db->f('oppsynsmannid'))
- {
- $invoice_roleback[$i]['oppsynsmannid']
= $this->db->f('oppsynsmannid');
- }
- if($this->db->f('saksbehandlerid'))
- {
-
$invoice_roleback[$i]['saksbehandlerid'] = $this->db->f('saksbehandlerid');
- }
-
- $invoice_roleback[$i]['budsjettansvarligid'] =
$this->db->f('budsjettansvarligid');
-
- if($this->db->f('oppsynsigndato'))
- {
- $invoice_roleback[$i]['oppsynsigndato']
= $this->db->f('oppsynsigndato');
- }
- if($this->db->f('saksigndato'))
- {
- $invoice_roleback[$i]['saksigndato'] =
$this->db->f('saksigndato');
- }
-
- $invoice_roleback[$i]['budsjettsigndato']
= $this->db->f('budsjettsigndato');
- $invoice_roleback[$i]['merknad']
= $this->db->f('merknad');
- $invoice_roleback[$i]['splitt']
= $this->db->f('splitt');
- $invoice_roleback[$i]['ordrebelop']
= $this->db->f('ordrebelop');
- $invoice_roleback[$i]['utbetalingid']
= $this->db->f('utbetalingid');
- $invoice_roleback[$i]['utbetalingsigndato']
= $this->db->f('utbetalingsigndato');
- $i++;
+ $invoice_roleback[] = array
+ (
+ 'id'
=> $this->db->f('id'),
+ 'bilagsnr'
=> $this->db->f('bilagsnr'),
+ 'kidnr'
=> $this->db->f('kidnr'),
+ 'typeid'
=> $this->db->f('typeid'),
+ 'kildeid'
=> $this->db->f('kildeid'),
+ 'pmwrkord_code'
=> $this->db->f('pmwrkord_code'),
+ 'belop'
=> $this->db->f('belop'),
+ 'fakturadato'
=> $this->db->f('fakturadato'),
+ 'periode'
=> $this->db->f('periode'),
+ 'forfallsdato'
=> $this->db->f('forfallsdato'),
+ 'fakturanr'
=> $this->db->f('fakturanr'),
+ 'spbudact_code'
=> $this->db->f('spbudact_code'),
+ 'regtid'
=> $this->db->f('regtid'),
+ 'artid'
=> $this->db->f('artid'),
+ 'godkjentbelop'
=> $this->db->f('godkjentbelop'),
+ 'spvend_code'
=> $this->db->f('spvend_code'),
+ 'dima'
=> $this->db->f('dima'),
+ 'loc1'
=> $this->db->f('loc1'),
+ 'dimb'
=> $this->db->f('dimb'),
+ 'dime'
=> $this->db->f('dime'),
+ 'mvakode'
=> $this->db->f('mvakode'),
+ 'dimd'
=> $this->db->f('dimd'),
+ 'project_id'
=> $this->db->f('project_id'),
+ 'kostra_id'
=> $this->db->f('kostra_id'),
+ 'item_type'
=> $this->db->f('item_type'),
+ 'item_id'
=> $this->db->f('item_id'),
+ 'oppsynsmannid'
=> $this->db->f('oppsynsmannid'),
+ 'saksbehandlerid'
=> $this->db->f('saksbehandlerid'),
+ 'budsjettansvarligid' =>
$this->db->f('budsjettansvarligid'),
+ 'oppsynsigndato'
=> $this->db->f('oppsynsigndato'),
+ 'saksigndato'
=> $this->db->f('saksigndato'),
+ 'budsjettsigndato'
=> $this->db->f('budsjettsigndato'),
+ 'merknad'
=> $this->db->f('merknad'),
+ 'splitt'
=> $this->db->f('splitt'),
+ 'ordrebelop'
=> $this->db->f('ordrebelop'),
+ 'utbetalingid'
=> $this->db->f('utbetalingid'),
+ 'utbetalingsigndato' =>
$this->db->f('utbetalingsigndato'),
+ );
}
return $invoice_roleback;
}
@@ -249,7 +237,7 @@
function bilag_update_overf($BilagOverf)
{
$values = array
- (
+ (
$BilagOverf['project_id'],
$BilagOverf['kostra_id'],
$BilagOverf['pmwrkord_code'],
@@ -272,6 +260,7 @@
$BilagOverf['dima'],
$BilagOverf['loc1'],
$BilagOverf['dimd'],
+ $BilagOverf['dime'],
$BilagOverf['mvakode'],
$BilagOverf['periode'],
$this->db->db_addslashes($BilagOverf['merknad']),
@@ -288,7 +277,7 @@
$sql = "INSERT INTO fm_ecobilag
(project_id,kostra_id,pmwrkord_code,bilagsnr,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,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,item_type,item_id,belop,godkjentbelop)"
. " values ($values,"
. $this->db->money_format($BilagOverf['belop']) . ","
@@ -366,15 +355,7 @@
$day = $dateparts[$d];
$month = $dateparts[$m];
$year = $dateparts[$y];
- /* $date1 = mktime
(2,0,0,$month,$day,$year);
- if ($date1)
- {
- $Dato=$date1;
- }
- $Dato= date("M d Y",$Dato);
- */
-
$BilagOverf = $this->select_invoice_rollback($day,
$month, $year, $Filnavn);
$this->db->transaction_begin();
@@ -389,15 +370,7 @@
$Belop = sprintf("%01.2f",
$BilagOverf[$i]['ordrebelop']) * 100;
- if($BilagOverf[$i]['dimd'] % 2 == 0)
- {
- $actual_cost_field =
'act_mtrl_cost';
- }
- else
- {
- $actual_cost_field =
'act_vendor_cost';
- }
-
+ $actual_cost_field = 'act_vendor_cost';
$operator = '-';
$this->soXport->correct_actual_cost($BilagOverf[$i]['pmwrkord_code'], $Belop,
$actual_cost_field, $operator);
@@ -762,14 +735,8 @@
//Oppdater beløp på arbeidsordre
if($download == 'on')
{
-
if($invoice_line['dimd'] % 2 == 0)
- {
-
$actual_cost_field = 'act_mtrl_cost';
- }
- else
- {
-
$actual_cost_field = 'act_vendor_cost';
- }
+ $actual_cost_field =
'act_vendor_cost';
+
$operator = '+';
if(!$this->debug)
@@ -790,9 +757,9 @@
$Dim_4 = sprintf("%-8s", '');//
verdi: Ressurs, type: c8, plass: 53 - 60
$Dim_5 = sprintf("%-12s",
$invoice_line['project_id']);// verdi: Prosjekt, type: c12, plass: 61 - 72
-//FIXME 'dime' må legges inn...
- $Dim_6 = sprintf("%-4s",
$invoice_line['dime']);// Kategori, type: c4, plass: 73 - 76
+ $Dim_6 = sprintf("%-4s",
$invoice_line['dimd']);// Kategori, type: c4, plass: 73 - 76
+
$Dim_7 = sprintf("%-4s", '');// verdi:
Blank, type: c4, plass: 77 - 80
$Avgiftskode = sprintf("%-2s",
$invoice_line['mvakode']);// verdi: Avgiftskode, type: c2, plass: 81 - 82
@@ -993,4 +960,4 @@
}
}
}
- }
\ No newline at end of file
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11767] Merge 11761:11766 from trunk,
Sigurd Nes <=