[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9270] Merge 9263:9269 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9270] Merge 9263:9269 from trunk |
|
Date: |
Thu, 03 May 2012 13:24:07 +0000 |
Revision: 9270
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9270
Author: sigurdne
Date: 2012-05-03 13:24:06 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Merge 9263:9269 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/setup/setup.inc.php
branches/Version-1_0-branch/booking/setup/tables_current.inc.php
branches/Version-1_0-branch/booking/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.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/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
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,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262
+
/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
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-05-03 11:21:23 UTC (rev 9269)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -13,6 +13,11 @@
function __construct()
{
+ $this->event_so = CreateObject('booking.soevent');
+ $this->allocation_bo =
CreateObject('booking.boallocation');
+ $this->booking_bo = CreateObject('booking.bobooking');
+ $this->event_bo = CreateObject('booking.boevent');
+ $this->organization_bo =
CreateObject('booking.boorganization');
$this->customer_id =
CreateObject('booking.customer_identifier');
$this->completed_reservation_so =
CreateObject('booking.socompleted_reservation');
$this->completed_reservation_bo =
CreateObject('booking.bocompleted_reservation');
@@ -596,7 +601,10 @@
//$orders = array();
$export_info = array();
$output = array();
+ $log = array();
+ $log[] = 'Ordrenr;Kunde navn - Nummer;Varelinjer med
dato;Bygg;Beløp';
+
/* NOTE: The specification states that values of type
date
* should be left padded with spaces. The example file,
* however, is right padded with spaces.
@@ -640,13 +648,22 @@
$stored_header = array();
$line_no = 0;
$header_count = 0;
+ $log_order_id = '';
+ $log_customer_name = '';
+ $log_customer_nr = '';
+ $log_buidling = '';
+
+ $internal = false;
+
foreach($reservations as &$reservation) {
+
if ($this->get_cost_value($reservation['cost'])
<= 0) {
continue; //Don't export costless rows
}
+
$type = $reservation['customer_type'];
-
- if (($stored_header == array()) ||
($stored_header['tekst2'] !=
$this->get_customer_identifier_value_for($reservation)))
+
+ if ($stored_header == array() ||
$stored_header['tekst2'] !=
$this->get_customer_identifier_value_for($reservation))
{
$order_id =
$sequential_number_generator->increment()->get_current();
$export_info[] =
$this->create_export_item_info($reservation, $order_id);
@@ -682,13 +699,13 @@
}
//Nøkkelfelt, kundens personnr/orgnr.
+ $stored_header['tekst2'] =
$this->get_customer_identifier_value_for($reservation);
+
if ($type == 'internal') {
$header['tekst2'] =
str_pad(substr($config->config_data['organization_value'], 0, 12), 12, ' ');
- $stored_header['tekst2'] =
$config->config_data['organization_value'];
$header['ext_ord_ref'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 15),
15, ' ');
} else {
$header['tekst2'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 12),
12, ' ');
- $stored_header['tekst2'] =
$this->get_customer_identifier_value_for($reservation);
}
$header['line_no'] = '0000'; //Nothing
here according to example file but spec. says so
@@ -793,6 +810,39 @@
$output[] = implode('',
str_replace(array("\n", "\r"), '', $item));
$output[] = implode('',
str_replace(array("\n", "\r"), '', $text));
+ $log_order_id = $order_id;
+
+ if ($type == 'internal') {
+ $log_customer_nr =
$header['tekst2'].' '.$header['ext_ord_ref'];
+ } else {
+ $log_customer_nr =
$header['tekst2'];
+ }
+
if(!empty($reservation['organization_id'])) {
+ $org =
$this->organization_bo->read_single($reservation['organization_id']);
+ $log_customer_name =
$org['name'];
+ } else {
+ $data =
$this->event_so->get_org($reservation['customer_organization_number']);
+ if(!empty($data['id'])) {
+ $log_customer_name =
$data['name'];
+ } else {
+
if($reservation['reservation_type'] == 'event') {
+ $data =
$this->event_bo->read_single($reservation['reservation_id']);
+
$log_customer_name = $data['contact_name'];
+# } elseif
($reservation['reservation_type'] == 'booking') {
+# $data =
$this->booking_bo->read_single($reservation['reservation_id']);
+#
error_log('b'.$data['id']." ".$data['group_id']);
+# } else {
+# $data =
$this->allocation_bo->read_single($reservation['reservation_id']);
+#
error_log('a'.$data['id']." ".$data['organization_id']);
+ }
+ }
+ }
+
+ $log_buidling =
$reservation['building_name'];
+ $log_cost = $reservation['cost'];
+ $log_varelinjer_med_dato =
$reservation['article_description'].' - '.$reservation['description'];
+
+ $log[] =
$log_order_id.';'.$log_customer_name.' -
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
} else {
//item level
@@ -872,6 +922,12 @@
//$orders[] = array('header' =>
$header, 'items' => array('item' => $item, 'text' => $text));
$output[] = implode('',
str_replace(array("\n", "\r"), '', $item));
$output[] = implode('',
str_replace(array("\n", "\r"), '', $text));
+
+ $log_cost = $reservation['cost'];
+ $log_varelinjer_med_dato =
$reservation['article_description'].' - '.$reservation['description'];
+
+ $log[] =
$log_order_id.';'.$log_customer_name.' -
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
+
}
}
@@ -879,7 +935,7 @@
return null;
}
- return array('data' => implode("\n", $output), 'info'
=> $export_info, 'header_count' => $header_count);
+ return array('data' => implode("\n", $output),
'data_log' => implode("\n", $log), 'info' => $export_info, 'header_count' =>
$header_count);
}
protected function get_agresso_row_template() {
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-05-03 11:21:23 UTC (rev 9269)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -24,6 +24,7 @@
'id' =>
array('type' => 'int'),
'type' => array('type'
=> 'string', 'required' => true, 'query' => true),
'filename' => array('type'
=> 'string'),
+ 'log_filename' => array('type'
=> 'string'),
'total_cost' => array('type' =>
'decimal', 'required' => true),
'total_items' => array('type' =>
'int', 'required' => true),
key(booking_socommon::$AUTO_CREATED_ON)
=> current(booking_socommon::$AUTO_CREATED_ON),
@@ -71,6 +72,14 @@
return null;
}
+
+ public function get_logfile($entity_file) {
+ if (isset($entity_file['log_filename']) &&
!empty($entity_file['log_filename'])) {
+ return
$this->file_storage->get($entity_file['log_filename']);
+ }
+
+ return null;
+ }
public function
associate_reservation_with_export_file($reservation_id, $export_file_id,
$invoice_order_id) {
$this->so_completed_reservation->associate_with_export_file($reservation_id,
$export_file_id, $invoice_order_id);
@@ -121,15 +130,16 @@
if
(!is_null($export_result['export'])) {
$export_infos[$export_type][] = $export_result['export']['info'];
}
+
if ($export_type == 'external') {
$export_result['total_items'] = $export_result['export']['header_count'];
+ $export_log =
$export_result['export']['data_log'];
}
$export_configurations[$export_type][$export['id']] = $conf;
$total_items[$export_type] +=
$export_result['total_items'];
$total_cost[$export_type] +=
$export_result['total_cost'];
}
-
$export_data[$export_type] =
$this->combine_export_result_data($export_results[$export_type]);
}
@@ -147,23 +157,29 @@
$entity_export_file['id'] =
$receipt['id'];
$entity_export_file['filename'] =
'export_'.$export_type.'_'.$entity_export_file['id'].'.'.$this->file_type_for_export_type($export_type);
-
$export_file = new
booking_storage_object($entity_export_file['filename']);
$export_files[] = $export_file;
$export_file->set_data($export_data[$export_type]);
-
+
$this->file_storage->attach($export_file)->persist();
-
+
+ if ($export_type == 'external') {
+ $entity_export_file['log_filename'] =
'log_'.$export_type.'_'.$entity_export_file['id'].'.csv';
+ $log_export_file = new
booking_storage_object($entity_export_file['log_filename']);
+ $log_export_files[] = $log_export_file;
+ $log_export_file->set_data($export_log);
+
$this->file_storage->attach($log_export_file)->persist();
+ }
$this->update($entity_export_file);
//Save the generated file name
$entity_export_files[$entity_export_file['id']] = $entity_export_file;
foreach($export_configurations[$export_type] as $export_id => $conf) {
- $export_conf_updates[] =
sprintf(
- "UPDATE
bb_completed_reservation_export_configuration SET export_file_id=%s WHERE
id=%s",
-
$entity_export_file['id'],
- $conf['id']
- );
+ $export_conf_updates[] = sprintf(
+ "UPDATE
bb_completed_reservation_export_configuration SET export_file_id=%s WHERE
id=%s",
+ $entity_export_file['id'],
+ $conf['id']
+ );
}
$associated_reservation_count = 0;
Modified:
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
2012-05-03 11:21:23 UTC (rev 9269)
+++
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -9,6 +9,7 @@
'show' => true,
'add' => true,
'download' => true,
+ 'log' => true,
'upload' => true,
);
@@ -52,6 +53,7 @@
$export_file['created_on'] =
pretty_timestamp($export_file['created_on']);
$export_file['index_link'] = $this->link_to('index');
$export_file['download_link'] =
$this->link_to('download', array('id' => $export_file['id']));
+ $export_file['log_link'] = $this->link_to('log',
array('id' => $export_file['id']));
}
public function index()
@@ -121,6 +123,12 @@
'sortable' => false,
),
array(
+ 'key' => 'log',
+ 'label' =>
lang('Logfile'),
+ 'formatter' =>
'YAHOO.booking.formatGenericLink()',
+ 'sortable' => false,
+ ),
+ array(
'key' => 'link',
'hidden' => true
),
@@ -147,6 +155,17 @@
'label' => lang('Download'),
'href' => $this->link_to('download',
array('id' => $export_file['id']))
);
+ if ($export_file['total_items'] > 0 and $export_file['id'] >
$config->config_data['invoice_last_id'] and
!empty($export_file['log_filename'])) {
+ $export_file['log'] = array(
+ 'label' => lang('log'),
+ 'href' => $this->link_to('log',
array('id' => $export_file['id']))
+ );
+ } else {
+ $export_file['log'] = array(
+ 'label' => ' ',
+ 'href' => '#'
+ );
+ }
if ($export_file['total_items'] > 0 and
$export_file['id'] > $config->config_data['invoice_last_id'])
{
$export_file['upload'] = array(
@@ -189,6 +208,17 @@
$this->send_file($file->get_system_identifier(),
array('filename' => $file->get_identifier()));
}
+ public function log() {
+ $export_file =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+
+ if (!is_array($export_file)) {
+ $this->redirect_to('index');
+ }
+
+ $file = $this->bo->get_logfile($export_file);
+
+ $this->send_file($file->get_system_identifier(),
array('filename' => $file->get_identifier()));
+ }
public function upload() {
$id = phpgw::get_var('id', 'GET');
$export_file =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2012-05-03
11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2012-05-03
13:24:06 UTC (rev 9270)
@@ -550,3 +550,5 @@
Billing sequence numbers booking no Sekvensnummer for fakturering
Do not change these values unless you know what they are. booking no
Ikke endre disse verdiene med mindre du vet hva de er.
Organization is missing booking charge booking no Organisasjonen mangler
bookingansvarlig
+Logfile booking no Logfil
+log booking no Last ned
Modified: branches/Version-1_0-branch/booking/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/setup.inc.php 2012-05-03
11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/booking/setup/setup.inc.php 2012-05-03
13:24:06 UTC (rev 9270)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.08';
+ $setup_info['booking']['version'] = '0.2.09';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/booking/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2012-05-03 11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -640,6 +640,7 @@
'fd' => array(
'id'
=> array('type' => 'auto', 'nullable' => False),
'filename'
=> array('type' => 'text'),
+ 'log_filename'
=> array('type' => 'text'),
'type' =>
array('type' => 'text', 'nullable' => False),
'total_cost' =>
array('type' => 'decimal','precision' => '10', 'scale'=>'2', 'nullable' =>
False),
'total_items' =>
array('type' => 'int','precision' => '4','nullable' => False),
Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2012-05-03 11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -2615,5 +2615,23 @@
}
}
+ $test[] = '0.2.08';
+ /**
+ * Update booking version from 0.2.08 to 0.2.09
+ * add log file name to completed_reservation_export_file
+ *
+ */
+ function booking_upgrade0_2_08()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_completed_reservation_export_file ADD COLUMN log_filename text");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.09';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
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-03 11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -1096,6 +1096,18 @@
return $values;
}
+ function get_default_dimb_role_user($role_id, $dimb)
+ {
+ $dimb = (int) $dimb;
+ $role_id = (int) $role_id;
+ $sql = "SELECT user_id FROM fm_ecodimb_role_user"
+ ." WHERE role_id = {$role_id} AND ecodimb = {$dimb} AND
expired_on IS NULL AND default_user = 1";
+//_debug_array($sql);
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ return (int)$this->db->f('user_id');
+ }
+
function check_count($voucher_id)
{
@@ -2019,11 +2031,22 @@
$this->db->next_record();
$amount = $this->db->f('belop');
- if(($amount - $split_amount) < 0)
+ if($amount > 0)
{
-
phpgwapi_cache::message_set(lang('negative sum'), 'error');
- continue;
+ if(($amount - $split_amount) <=
0)
+ {
+
phpgwapi_cache::message_set(lang('negative sum'), 'error');
+ continue;
+ }
}
+ else
+ {
+ if(($amount - $split_amount) >=
0)
+ {
+
phpgwapi_cache::message_set(lang('positive sum'), 'error');
+ continue;
+ }
+ }
$metadata = $this->db->metadata($table);
$sql ="SELECT * FROM {$table} WHERE id=
{$id}";
@@ -2032,7 +2055,8 @@
$value_set = array();
- $skip_values =
array('id','pmwrkord_code', 'spbudact_code', 'dima', 'dimb', 'dime', 'loc1',
'mvakode', 'dimd', 'merknad',
'line_text','oppsynsmannid','saksbehandlerid','oppsynsigndato','saksigndato','budsjettsigndato');
+ $skip_values = array('id','project_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/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-05-03 11:21:23 UTC (rev 9269)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -43,9 +43,6 @@
var $splitt=0;
var $soXport;
var $invoice;
- var $bestiller = 85; //cat_id for rolle
- var $attestant = 150; //cat_id for rolle
- var $budsjettansvarlig = 146; //cat_id for rolle
var $default_kostra_id = 9999; //dummy
var $debug = false;
var $skip_import = false;
@@ -810,13 +807,10 @@
$toarray[] = $prefs['email'];
}
*/
- $criteria_supervisor =
array('ecodimb' => $order_info['dimb'], 'cat_id' => $this->attestant); //
attestere
- $supervisor_contact_id =
$this->responsible->get_responsible($criteria_supervisor);
- if($supervisor_contact_id)
+ $supervisor_user_id =
$this->invoice->get_default_dimb_role_user(2, $order_info['dimb']);
+ if($supervisor_user_id)
{
- $supervisor_user_id
= $this->responsible->get_contact_user_id($supervisor_contact_id);
$order_info['supervisor']
= $GLOBALS['phpgw']->accounts->get($supervisor_user_id)->lid;
-
/*
$prefs =
$this->bocommon->create_preferences('property', $supervisor_user_id);
if($prefs['email'])
@@ -826,11 +820,9 @@
*/
}
- $criteria_budget_responsible =
array('ecodimb' => $order_info['dimb'], 'cat_id' => $this->budsjettansvarlig);
//anviser
- $budget_responsible_contact_id =
$this->responsible->get_responsible($criteria_budget_responsible);
- if($budget_responsible_contact_id)
+ $budget_responsible_user_id =
$this->invoice->get_default_dimb_role_user(3, $order_info['dimb']);
+ if($budget_responsible_user_id)
{
- $budget_responsible_user_id
= $this->responsible->get_contact_user_id($budget_responsible_contact_id);
$order_info['budget_responsible'] =
$GLOBALS['phpgw']->accounts->get($budget_responsible_user_id)->lid;
}
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-05-03 11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-05-03 13:24:06 UTC (rev 9270)
@@ -99,11 +99,11 @@
{
if(isset($this->config->config_data['common']['invoice_approval']) &&
$this->config->config_data['common']['invoice_approval']== 1)
{
- $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr =
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR
(budsjettsigndato IS NOT NULL AND utbetalingsigndato IS NOT NULL) ORDER BY
bilagsnr ASC";
+ $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr =
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR
budsjettsigndato IS NOT NULL ORDER BY bilagsnr ASC";
}
else
{
- $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr =
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR (
budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR oppsynsigndato IS
NOT NULL) AND utbetalingsigndato IS NOT NULL ) ORDER BY bilagsnr ASC";
+ $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr =
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR (
budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR oppsynsigndato IS
NOT NULL) ) ORDER BY bilagsnr ASC";
}
$this->db->query($sql,__LINE__,__FILE__);
$vouchers_step1 = array();
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-05-03 11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -1163,7 +1163,7 @@
),
'fm_ecodimb' => array(
'fd' => array(
- 'id' => array('type' => 'int','precision' =>
'2','nullable' => False),
+ 'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'descr' => array('type' =>
'varchar','precision' => '25','nullable' => False)
),
'pk' => array('id'),
@@ -1184,7 +1184,7 @@
'fm_ecodimb_role_user' => array(
'fd' => array(
'id' => array('type' => 'auto','precision' =>
'4','nullable' => False),
- 'ecodimb' => array('type' => 'int','precision'
=> '2','nullable' => False),
+ 'ecodimb' => array('type' => 'int','precision'
=> '4','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
'role_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
'default' => array('type' => 'int','precision'
=> '2','nullable' => true),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-03 11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-03 13:24:06 UTC (rev 9270)
@@ -6249,6 +6249,7 @@
function property_upgrade0_9_17_642()
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_ecodimb','id',
array('type' => 'int','precision' => '4','nullable' => false));
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_ecobilag','splitt',
array('type' => 'int','precision' => '4','nullable' => True));
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_ecobilagoverf','splitt',
array('type' => 'int','precision' => '4','nullable' => True));
@@ -6273,7 +6274,7 @@
'fm_ecodimb_role_user', array(
'fd' => array(
'id' => array('type' =>
'auto','precision' => '4','nullable' => False),
- 'ecodimb' => array('type' =>
'int','precision' => '2','nullable' => False),
+ 'ecodimb' => array('type' =>
'int','precision' => '4','nullable' => False),
'user_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'role_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'default_user' => array('type' =>
'int','precision' => '2','nullable' => true),
Modified: branches/Version-1_0-branch/property/templates/base/invoice2.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/invoice2.xsl
2012-05-03 11:21:23 UTC (rev 9269)
+++ branches/Version-1_0-branch/property/templates/base/invoice2.xsl
2012-05-03 13:24:06 UTC (rev 9270)
@@ -98,8 +98,6 @@
<xsl:call-template name="msgbox"/>
</xsl:when>
</xsl:choose>
-
- <div id="receipt"></div>
<div class="body">
<div id="voucher_details">
<!--<xsl:call-template
name="yui_phpgw_i18n"/>-->
@@ -575,6 +573,7 @@
<div id="datatable-container"/>
<xsl:call-template name="datasource-definition" />
+ <div id="receipt"></div>
<xsl:variable name="label_submit"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
<div class="row_on"><input type="submit" name="values[update_voucher]"
id="frm_update_voucher" value="{$label_submit}"/></div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9270] Merge 9263:9269 from trunk,
Sigurd Nes <=