fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [17585] Stable: Merge 17582:17584 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [17585] Stable: Merge 17582:17584 from trunk
Date: Mon, 15 Jan 2018 10:59:58 -0500 (EST)

Revision: 17585
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17585
Author:   sigurdne
Date:     2018-01-15 10:59:57 -0500 (Mon, 15 Jan 2018)
Log Message:
-----------
Stable: Merge 17582:17584 from trunk

Modified Paths:
--------------
    
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
    branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2018-01-15 15:58:50 UTC (rev 17584)
+++ branches/Version-2_0-branch 2018-01-15 15:59:57 UTC (rev 17585)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16846
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491,17493-17509,17511-17512,17514,17516-17581
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491,17493-17509,17511-17512,17514,17516-17581,17583-17584
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2018-01-15 15:58:50 UTC (rev 17584)
+++ branches/Version-2_0-branch/booking 2018-01-15 15:59:57 UTC (rev 17585)

Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /branches/dev-syncromind-2/booking:14933-16846
 /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157,17175-17188,17313-17314,17353-17354,17370,17394-17424,17426-17430,17432-17477,17493-17509,17516-17581
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040,17076-17088,17126-17132,17134-17143,17152-17157,17175-17188,17313-17314,17353-17354,17370,17394-17424,17426-17430,17432-17477,17493-17509,17516-17581,17583-17584
\ No newline at end of property
Modified: 
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
--- 
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
        2018-01-15 15:58:50 UTC (rev 17584)
+++ 
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
        2018-01-15 15:59:57 UTC (rev 17585)
@@ -676,6 +676,198 @@
 //                                      fakturagrunnlag.
 //                     MRK07 -  Internfaktura merkes ved verdi 1 i dette 
feltet.
 
+
+                       $export_info = array();
+                       $output = array();
+
+                       $log = array();
+
+                       $date = str_pad(date('Ymd'), 17, ' ', STR_PAD_LEFT);
+
+                       $config = CreateObject('phpgwapi.config', 'booking');
+                       $config->read();
+
+
+
+                       $stored_header = array();
+                       $line_no = 0;
+                       $header_count = 0;
+                       $log_order_id = '';
+                       $log_customer_name = '';
+                       $log_customer_nr = '';
+                       $log_buidling = '';
+
+                       $internal = false;
+
+                       $ant_post = 0;
+                       $linjenr = 1;
+                       $lopenr = 1;
+
+                       foreach ($reservations as &$reservation)
+                       {
+                               if ($this->get_cost_value($reservation['cost']) 
<= 0)
+                               {
+                                       continue; //Don't export costless rows
+                               }
+
+                               if (!empty($reservation['organization_id']))
+                               {
+                                       $org = 
$this->organization_bo->read_single($reservation['organization_id']);
+                                       $reservation['organization_name'] = 
$org['name'];
+                               }
+                               else
+                               {
+                                       $data = 
$this->event_so->get_org($reservation['customer_organization_number']);
+                                       if (!empty($data['id']))
+                                       {
+                                               
$reservation['organization_name'] = $data['name'];
+                                       }
+                                       else
+                                       {
+                                               if 
($reservation['reservation_type'] == 'event')
+                                               {
+                                                       $data = 
$this->event_bo->read_single($reservation['reservation_id']);
+                                                       
$reservation['organization_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']);
+                                               }
+                                       }
+                               }
+
+                               $type = $reservation['customer_type'];
+
+                               $order_id = 
$sequential_number_generator->increment()->get_current();
+                               $export_info[] = 
$this->create_export_item_info($reservation, $order_id);
+                               $header_count += 1;
+                               $stored_header['kundenr'] = $kundenr;
+
+                               $kundenr = 
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 11), 
11, '0', STR_PAD_LEFT);
+
+
+                               if 
(strlen($this->get_customer_identifier_value_for($reservation)) > 9)
+                               {
+                                       $name = str_pad(iconv("utf-8", 
"ISO-8859-1//TRANSLIT", $reservation['organization_name']), 40, ' ');
+                               }
+                               else
+                               {
+                                       $name = str_pad(iconv("utf-8", 
"ISO-8859-1//TRANSLIT", $reservation['organization_name']), 40, ' ');
+                               }
+
+                               //Startpost ST
+                               $startpost = $this->get_visma_ST_row_template();
+                               $startpost['posttype'] = 'ST';
+                               $startpost['referanse'] = 
str_pad(substr(iconv("utf-8", "ISO-8859-1//TRANSLIT", 
$reservation['article_description']), 0, 60), 60, ' ');
+#                              $startpost['referanse'] = 
str_pad(substr(iconv("utf-8","ISO-8859-1//TRANSLIT",$account_codes['invoice_instruction']),
 0, 60), 60, ' ');
+                               //Fakturalinje FL
+                               $fakturalinje = 
$this->get_visma_FL_row_template();
+                               $fakturalinje['posttype'] = 'FL';
+                               $fakturalinje['kundenr'] = $kundenr;
+                               $fakturalinje['navn'] = $name;
+#                              $fakturalinje['adresse1'] = ;
+#                              $fakturalinje['adresse2'] = ;
+#                              $fakturalinje['postnr'] = ;
+                               $fakturalinje['betform'] = 'BG';
+                               $fakturalinje['oppdrgnr'] = 
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT", 
$account_codes['object_number']), 3, '0', STR_PAD_LEFT);
+                               $fakturalinje['varenr'] = 
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT", 
$account_codes['responsible_code']), 4, '0', STR_PAD_LEFT);
+                               $fakturalinje['lopenr'] = 
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT", $lopenr), 2, '0', STR_PAD_LEFT);
+                               $fakturalinje['pris'] = 
str_pad($reservation['cost'] * 100, 8, '0', STR_PAD_LEFT) . ' ';
+                               $fakturalinje['grunnlag'] = '000000001';
+                               $fakturalinje['belop'] = 
str_pad($reservation['cost'] * 100, 8, '0', STR_PAD_LEFT) . ' ';
+#                              $fakturalinje['saksnr'] = ;
+                               //Linjetekst LT
+                               $linjetekst = 
$this->get_visma_LT_row_template();
+                               $linjetekst['posttype'] = 'LT';
+                               $linjetekst['kundenr'] = $kundenr;
+                               $linjetekst['oppdrgnr'] = 
str_pad(iconv("utf-8", "ISO-8859-1//TRANSLIT", 
$account_codes['object_number']), 3, '0', STR_PAD_LEFT);
+                               $linjetekst['varenr'] = str_pad(iconv("utf-8", 
"ISO-8859-1//TRANSLIT", $account_codes['responsible_code']), 4, '0', 
STR_PAD_LEFT);
+                               $linjetekst['lopenr'] = str_pad(iconv("utf-8", 
"ISO-8859-1//TRANSLIT", $lopenr), 2, '0', STR_PAD_LEFT);
+                               $linjetekst['linjenr'] = $linjenr;
+                               $linjetekst['tekst'] = str_pad(iconv("utf-8", 
"ISO-8859-1//TRANSLIT", $reservation['description']), 50, ' ');
+                               $ant_post += 3;
+
+                               //Sluttpost SL
+                               $sluttpost = $this->get_visma_SL_row_template();
+                               $sluttpost['posttype'] = 'SL';
+                               $sluttpost['antpost'] = 
str_pad(intval($ant_post) + 1, 8, '0', STR_PAD_LEFT);
+                               $ant_post = 0;
+
+
+                               $log_order_id = $order_id;
+
+                               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_customer_nr = 
$this->get_customer_identifier_value_for($reservation);
+                               $log_buidling = $reservation['building_name'];
+                               $log_cost = $reservation['cost'];
+                               $log_varelinjer_med_dato = 
$reservation['article_description'] . ' - ' . $reservation['description'];
+
+                               $line_field = array();
+
+                               $line_field[] = "\"{$reservation['id']}\"";
+                               $line_field[] = 
"\"{$reservation['reservation_type']}\"";
+                               $line_field[] = "\"{$log_order_id}\"";
+                               $line_field[] = "\"{$log_customer_name}\"";
+                               $line_field[] = "\"{$log_customer_nr}\"";
+                               $line_field[] = 
"\"{$log_varelinjer_med_dato}\"";
+                               $line_field[] = "\"{$log_buidling}\"";
+                               $line_field[] = "\"{$log_cost}\"";
+
+                               $log[] = implode(';',  $line_field);
+
+               //              $log[] = $reservation['id'] . ';' . 
$reservation['reservation_type'] . ';' . $log_order_id . ';' . 
$log_customer_name . ' - ' . $log_customer_nr . ';' . $log_varelinjer_med_dato 
. ';' . $log_buidling . ';' . $log_cost;
+
+                               $output[] = implode('', str_replace(array("\n", 
"\r"), '', $startpost));
+                               $output[] = implode('', str_replace(array("\n", 
"\r"), '', $fakturalinje));
+                               $output[] = implode('', str_replace(array("\n", 
"\r"), '', $linjetekst));
+                               $output[] = implode('', str_replace(array("\n", 
"\r"), '', $sluttpost));
+                       }
+
+                       if (count($export_info) == 0)
+                       {
+                               return null;
+                       }
+                       if ($config->config_data['external_format_linebreak'] 
== 'Windows')
+                       {
+                               $file_format_linebreak = "\r\n";
+                       }
+                       else
+                       {
+                               $file_format_linebreak = "\n";
+                       }
+
+                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode(PHP_EOL, $log),
+                               'info' => $export_info, 'header_count' => 
$header_count);
+
                }
 
 
@@ -752,7 +944,7 @@
                                        $item['dim_4'] = 
str_pad(substr($account_codes['dim_4'], 0, 8), 8, ' ');
                                }
 
-                               //Kan være aktuelt å levere prosjektnr knyttet 
mot en booking, valgfritt 
+                               //Kan være aktuelt å levere prosjektnr knyttet 
mot en booking, valgfritt
                                if (isset($config->config_data['dim_5']))
                                {
                                        $item['dim_5'] = 
str_pad(strtoupper(substr($account_codes['project_number'], 0, 12)), 12, ' ');
@@ -1530,11 +1722,22 @@
                                return $row_template;
                        }
 
-                       $row_template = array('posttype' => str_repeat(' ', 2), 
'kundenr' => str_repeat(' ', 11),
-                               'navn' => str_repeat(' ', 30), 'adresse1' => 
str_repeat(' ', 30), 'adresse2' => str_repeat(' ', 30),
-                               'postnr' => str_repeat(' ', 4), 'betform' => 
str_repeat(' ', 2), 'oppdrgnr' => str_repeat(' ', 3),
-                               'varenr' => str_repeat(' ', 4), 'lopenr' => 
str_repeat(' ', 2), 'pris' => str_repeat(' ', 9),
-                               'grunnlag' => str_repeat(' ', 9), 'belop' => 
str_repeat(' ', 11), 'saksnr' => str_repeat(' ', 16));
+                       $row_template = array(
+                               'posttype' => str_repeat(' ', 2),
+                               'kundenr' => str_repeat(' ', 11),
+                               'navn' => str_repeat(' ', 30),
+                               'adresse1' => str_repeat(' ', 30),
+                               'adresse2' => str_repeat(' ', 30),
+                               'postnr' => str_repeat(' ', 4),
+                               'betform' => str_repeat(' ', 2),
+                               'oppdrgnr' => str_repeat(' ', 3),
+                               'varenr' => str_repeat(' ', 4),
+                               'lopenr' => str_repeat(' ', 2),
+                               'pris' => str_repeat(' ', 9),
+                               'grunnlag' => str_repeat(' ', 9),
+                               'belop' => str_repeat(' ', 11),
+                               'saksnr' => str_repeat(' ', 16)
+                       );
                        return $row_template;
                }
 
@@ -1546,9 +1749,14 @@
                                return $row_template;
                        }
 
-                       $row_template = array('posttype' => str_repeat(' ', 2), 
'kundenr' => str_repeat(' ', 11),
-                               'oppdrgnr' => str_repeat(' ', 3), 'varenr' => 
str_repeat(' ', 4), 'lopenr' => str_repeat(' ', 2),
-                               'linjenr' => str_repeat(' ', 2), 'tekst' => 
str_repeat(' ', 50));
+                       $row_template = array(
+                               'posttype' => str_repeat(' ', 2),
+                               'kundenr' => str_repeat(' ', 11),
+                               'oppdrgnr' => str_repeat(' ', 3),
+                               'varenr' => str_repeat(' ', 4),
+                               'lopenr' => str_repeat(' ', 2),
+                               'linjenr' => str_repeat(' ', 2),
+                               'tekst' => str_repeat(' ', 50));
                        return $row_template;
                }
 
@@ -1563,4 +1771,147 @@
                        $row_template = array('posttype' => str_repeat(' ', 2), 
'antpost' => str_repeat(' ', 8));
                        return $row_template;
                }
+
+               protected function get_visma_ST_row_template()
+               {
+                       static $row_template = false;
+                       if ($row_template)
+                       {
+                               return $row_template;
+                       }
+
+//                     Type Felt    Lengde Posisjon Beskrivelse             
M/K Merknader
+//                     ---- ------- ------ -------- ----------------------- 
--- ----------
+//                     ST   POSTTYPE   2   001-002  Posttype                 M 
 Verdi 'ST'
+//                     ST   REFERANSE 60   003-062  Referanse                K 
 ST01
+//                     ST   FORMAT     1   063-063  Utvidet format           K 
 ST02
+
+                       $row_template = array(
+                               'posttype' => 'ST',
+                               'referanse' => str_repeat(' ', 60),
+                               'format' => 'U'
+                       );
+                       return $row_template;
+               }
+
+               protected function get_visma_FL_row_template()
+               {
+                       static $row_template = false;
+                       if ($row_template)
+                       {
+                               return $row_template;
+                       }
+
+//                     UTVIDET FORMAT PÅ FL-LINJENE
+//                     ============================
+//
+//                     FL   POSTTYPE   2   001-002  Posttype                 M 
 Verdi 'FL'
+//                     FL   KUNDENR   11   003-013  Kundenummer              M
+//                     FL   NAVN      40   014-053  Kundens navn             K
+//                     FL   ADRESSE1  40   054-093  Adresselinje 1           K
+//                     FL   ADRESSE2  40   094-133  Adresselinje 2           K
+//                     FL   POSTNR     4   134-137  Postnummer               K
+//                     FL   BETFORM    2   138-139  Betalingstype (BG,PG)    M 
 MRK01
+//                     FL   OPPDRGNR   3   140-142  Oppdragsgivernummer      M 
 MRK02
+//                     FL   VARENR     4   143-146  Varenummer               M 
 MRK02
+//                     FL   LØPENR     2   147-148  Løpenummer               M 
 MRK03
+//                     FL   PRIS       9   149-157  Varens pris              M 
 MRK04
+//                     FL   GRUNNLAG   9   158-166  Antall av varen          M 
 MRK05
+//                     FL   BELØP     11   167-177  Utregnet beløp           M 
 MRK04
+//                     FL   SAKSNR    16   178-193  Saksnr                   K
+//                     FL   INTFAKT    1   194-194  Internfaktura            K 
 MRK07
+//                     FL   KB01      12   195-206  1. konteringsverdi       K
+//                     FL   KB02      12   207-218  2. konteringsverdi       K
+//                     FL   KB03      12   219-230  3. konteringsverdi       K
+//                     FL   KB04      12   231-242  4. konteringsverdi       K
+//                     FL   KB05      12   243-254  5. konteringsverdi       K
+//                     FL   KB06      12   255-266  6. konteringsverdi       K
+//                     FL   KB07      12   267-278  7. konteringsverdi       K
+//                     FL   KB08      12   279-290  8. konteringsverdi       K
+//                     FL   KB09      12   291-302  9. konteringsverdi       K
+//                     FL   KB10      12   303-314  10. konteringsverdi      K
+//                     FL   MVAKODE    3   315-317  Mva-kode                 K
+//                     FL   PROFIL    20   318-337  Profil                   K
+//                     FL   DERESREF  40   338-377  Kontaktinformasjon       K
+//                     FL   ORDREREF  20   378-397  Ordrereferanse           K
+
+                       $row_template = array(
+                               'posttype' => 'FL',
+                               'kundenr' => str_repeat(' ', 11),
+                               'navn' => str_repeat(' ', 40),
+                               'adresse1' => str_repeat(' ', 40),
+                               'adresse2' => str_repeat(' ', 40),
+                               'postnr' => str_repeat(' ', 4),
+                               'betform' => str_repeat(' ', 2),
+                               'oppdrgnr' => str_repeat(' ', 3),
+                               'varenr' => str_repeat(' ', 4),
+                               'lopenr' => str_repeat(' ', 2),
+                               'pris' => str_repeat(' ', 9),
+                               'grunnlag' => str_repeat(' ', 9),
+                               'belop' => str_repeat(' ', 11),
+                               'saksnr' => str_repeat(' ', 16),
+                               'intfakt' => str_repeat(' ', 1),
+                               'kb01' => str_repeat(' ', 12),
+                               'kb02' => str_repeat(' ', 12),
+                               'kb03' => str_repeat(' ', 12),
+                               'kb04' => str_repeat(' ', 12),
+                               'kb05' => str_repeat(' ', 12),
+                               'kb06' => str_repeat(' ', 12),
+                               'kb07' => str_repeat(' ', 12),
+                               'kb08' => str_repeat(' ', 12),
+                               'kb09' => str_repeat(' ', 12),
+                               'kb10' => str_repeat(' ', 12),
+                               'mvakode' => str_repeat(' ', 3),
+                               'profil' => str_repeat(' ', 20),
+                               'deresref' => str_repeat(' ', 40),
+                               'ordreref' => str_repeat(' ', 20),
+                       );
+                       return $row_template;
+               }
+
+               protected function get_visma_LT_row_template()
+               {
+                       static $row_template = false;
+                       if ($row_template)
+                       {
+                               return $row_template;
+                       }
+
+//                     LT   POSTTYPE   2   001-002  Posttype                 M 
 Verdi 'LT'
+//                     LT   KUNDENR   11   003-013  Kundenummer              M
+//                     LT   OPPDRGNR   3   014-016  Oppdragsgivernummer      M
+//                     LT   VARENR     4   017-020  Varenummer               M
+//                     LT   LØPENR     2   021-022  Løpenummer               M
+//                     LT   LINJENR    2   023-024  Linjenummer              M 
 MRK06
+//                     LT   TEKST     50   025-074  Fritekstlinje            K
+
+                       $row_template = array(
+                               'posttype' => 'LT',
+                               'kundenr' => str_repeat(' ', 11),
+                               'oppdrgnr' => str_repeat(' ', 3),
+                               'varenr' => str_repeat(' ', 4),
+                               'lopenr' => str_repeat(' ', 2),
+                               'linjenr' => str_repeat(' ', 2),
+                               'tekst' => str_repeat(' ', 50)
+                       );
+                       return $row_template;
+               }
+
+               protected function get_visma_SL_row_template()
+               {
+                       static $row_template = false;
+                       if ($row_template)
+                       {
+                               return $row_template;
+                       }
+//                     SL   POSTTYPE   2   001-002  Posttype                 M 
 Verdi 'SL'
+//                     SL   ANTPOST    8   003-010  Antall poster            M 
 Inkl. Start/Sluttpost
+
+                       $row_template = array(
+                               'posttype' => 'SL',
+                               'antpost' => str_repeat(' ', 8)
+                       );
+
+                       return $row_template;
+               }
        }
\ No newline at end of file

Modified: 
branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php    
2018-01-15 15:58:50 UTC (rev 17584)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php    
2018-01-15 15:59:57 UTC (rev 17585)
@@ -480,7 +480,7 @@
                                        $f_temp_primary = explode(', 
',$f_temp[2]);
                                        $f_temp_foreign = explode(', 
',$f_temp[5]);
 
-                                       $keystr = '';
+                                       $keystr = array();
                                        for 
($i=0;$i<count($f_temp_primary);$i++)
                                        {
                                                $keystr[] = "'" . 
$f_temp_primary[$i] . "' => '" . $f_temp_foreign[$i] . "'";




reply via email to

[Prev in Thread] Current Thread [Next in Thread]