fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [17002] Stable: Merge 17000:17001 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [17002] Stable: Merge 17000:17001 from trunk
Date: Sun, 27 Aug 2017 07:07:20 -0400 (EDT)

Revision: 17002
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17002
Author:   sigurdne
Date:     2017-08-27 07:07:20 -0400 (Sun, 27 Aug 2017)
Log Message:
-----------
Stable: Merge 17000:17001 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/rental/inc/class.socontract.inc.php
    branches/Version-2_0-branch/rental/inc/class.soinvoice.inc.php
    branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
    branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
    branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php
    branches/Version-2_0-branch/rental/inc/model/class.invoice.inc.php
    branches/Version-2_0-branch/rental/setup/phpgw_no.lang
    branches/Version-2_0-branch/rental/setup/setup.inc.php
    branches/Version-2_0-branch/rental/setup/tables_current.inc.php
    branches/Version-2_0-branch/rental/setup/tables_update.inc.php
    branches/Version-2_0-branch/rental/templates/base/contract.xsl

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

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch 2017-08-27 11:07:20 UTC (rev 17002)

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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/rental/inc/class.socontract.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.socontract.inc.php     
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/inc/class.socontract.inc.php     
2017-08-27 11:07:20 UTC (rev 17002)
@@ -356,7 +356,7 @@
                        {
                                // columns to retrieve
                                $columns[] = 'contract.id AS contract_id, 
contract.notify_on_expire, contract.notified_time';
-                               $columns[] = 'contract.date_start, 
contract.date_end, contract.old_contract_id, contract.executive_officer, 
contract.last_updated, contract.location_id, contract.billing_start, 
contract.billing_end, contract.service_id, contract.responsibility_id, 
contract.reference, contract.invoice_header, contract.project_id, 
billing.deleted, contract.account_in, contract.account_out, contract.term_id, 
contract.security_type, contract.security_amount, contract.comment, 
contract.due_date, 
contract.contract_type_id,contract.rented_area,contract.adjustable,contract.adjustment_interval,contract.adjustment_share,contract.adjustment_year,override_adjustment_start,contract.publish_comment';
+                               $columns[] = 'contract.date_start, 
contract.date_end, contract.old_contract_id, contract.executive_officer, 
contract.last_updated, contract.location_id, contract.billing_start, 
contract.billing_end, contract.service_id, contract.responsibility_id, 
contract.reference, contract.customer_order_id, contract.invoice_header, 
contract.project_id, billing.deleted, contract.account_in, 
contract.account_out, contract.term_id, contract.security_type, 
contract.security_amount, contract.comment, contract.due_date, 
contract.contract_type_id,contract.rented_area,contract.adjustable,contract.adjustment_interval,contract.adjustment_share,contract.adjustment_year,override_adjustment_start,contract.publish_comment';
                                $columns[] = 'party.id AS party_id';
                                $columns[] = 'party.first_name, 
party.last_name, party.company_name, party.department, party.org_enhet_id';
                                $columns[] = 'c_t.is_payer';
@@ -424,7 +424,8 @@
                                
$contract->set_last_updated($this->unmarshal($this->db->f('last_updated'), 
'int'));
                                
$contract->set_service_id($this->unmarshal($this->db->f('service_id'), 
'string'));
                                
$contract->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id'),
 'string'));
-                               
$contract->set_reference($this->unmarshal($this->db->f('reference'), 'string'));
+                               
$contract->set_reference($this->unmarshal($this->db->f('reference',true), 
'string'));
+                               
$contract->set_customer_order_id($this->unmarshal($this->db->f('customer_order_id'),
 'int'));
                                
$contract->set_invoice_header($this->unmarshal($this->db->f('invoice_header',true),
 'string'));
                                
$contract->set_account_in($this->unmarshal($this->db->f('account_in'), 
'string'));
                                
$contract->set_account_out($this->unmarshal($this->db->f('account_out'), 
'string'));
@@ -619,6 +620,7 @@
                        $values[] = "billing_start = " . 
$this->marshal($contract->get_billing_start_date(), 'int');
                        $values[] = "billing_end = " . 
$this->marshal($contract->get_billing_end_date(), 'int');
                        $values[] = "reference = " . 
$this->marshal($contract->get_reference(), 'string');
+                       $values[] = "customer_order_id = " . 
$this->marshal($contract->get_customer_order_id(), 'int');
 
                        // FORM COLUMN 2
                        $values[] = "service_id = " . 
$this->marshal($contract->get_service_id(), 'string');
@@ -804,6 +806,9 @@
                        $values[] = $this->marshal($contract->get_reference(), 
'string');
                        $values[] = 
$this->marshal($contract->get_invoice_header(), 'string');
 
+                       $cols[] = 'customer_order_id';
+                       $values[] = 
$this->marshal($contract->get_customer_order_id(), 'int');
+
                        $cols[] = 'account_in';
                        $cols[] = 'account_out';
                        $values[] = $this->marshal($contract->get_account_in(), 
'string');

Modified: branches/Version-2_0-branch/rental/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.soinvoice.inc.php      
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/inc/class.soinvoice.inc.php      
2017-08-27 11:07:20 UTC (rev 17002)
@@ -62,7 +62,7 @@
                        }
                        else
                        {
-                               $cols = 'rental_invoice.id, 
rental_invoice.contract_id, rental_invoice.billing_id, rental_invoice.party_id, 
timestamp_created, rental_invoice.timestamp_start, timestamp_end, 
rental_invoice.total_sum, total_area, header, rental_invoice.account_in, 
rental_invoice.account_out, rental_invoice.service_id, 
rental_invoice.responsibility_id, rental_invoice.project_id, 
rental_invoice.serial_number, rental_composite.name AS composite_name, 
party.identifier AS party_identifier, party.first_name AS party_first_name, 
party.last_name AS party_last_name, party.title AS party_title, 
party.company_name AS party_company_name, party.department AS party_department, 
party.address_1 AS party_address_1, party.address_2 AS party_address_2, 
party.postal_code AS party_postal_code, party.place AS party_place, party.phone 
AS party_phone, party.mobile_phone AS party_mobile_phone, party.fax AS 
party_fax, party.email AS party_email, party.url AS party_url, 
party.account_number AS party_account_number, party.reskontro AS 
party_reskontro, party.location_id AS party_location_id, party.is_inactive as 
party_in_active, contract.old_contract_id, rental_billing.title as 
billing_title, rental_billing_info.term_id, rental_billing_info.month, 
contract.reference';
+                               $cols = 'rental_invoice.id, 
rental_invoice.contract_id, rental_invoice.billing_id, rental_invoice.party_id, 
timestamp_created, rental_invoice.timestamp_start, timestamp_end, 
rental_invoice.total_sum, total_area, header, rental_invoice.account_in, 
rental_invoice.account_out, rental_invoice.service_id, 
rental_invoice.responsibility_id, rental_invoice.project_id, 
rental_invoice.serial_number, rental_composite.name AS composite_name, 
party.identifier AS party_identifier, party.first_name AS party_first_name, 
party.last_name AS party_last_name, party.title AS party_title, 
party.company_name AS party_company_name, party.department AS party_department, 
party.address_1 AS party_address_1, party.address_2 AS party_address_2, 
party.postal_code AS party_postal_code, party.place AS party_place, party.phone 
AS party_phone, party.mobile_phone AS party_mobile_phone, party.fax AS 
party_fax, party.email AS party_email, party.url AS party_url, 
party.account_number AS party_account_number, party.reskontro AS 
party_reskontro, party.location_id AS party_location_id, party.is_inactive as 
party_in_active, contract.old_contract_id, rental_billing.title as 
billing_title, rental_billing_info.term_id, rental_billing_info.month, 
contract.reference, contract.customer_order_id';
                                $dir = $ascending ? 'ASC' : 'DESC';
                                if ($sort_field == null || $sort_field == '') 
// Sort field not set
                                {
@@ -94,7 +94,8 @@
                                
$invoice->set_month($this->unmarshal($this->db->f('month'), 'int'));
                                
$invoice->set_billing_title($this->unmarshal($this->db->f('billing_title'), 
'string'));
                                
$invoice->set_serial_number($this->unmarshal($this->db->f('serial_number'), 
'int'));
-                               
$invoice->set_reference($this->unmarshal($this->db->f('reference'), 'string'));
+                               
$invoice->set_reference($this->unmarshal($this->db->f('reference',true), 
'string'));
+                               
$invoice->set_customer_order_id($this->unmarshal($this->db->f('customer_order_id'),
 'int'));
                                $party = new 
rental_party($this->unmarshal($this->db->f('party_id'), 'int'));
                                
$party->set_account_number($this->unmarshal($this->db->f('party_account_number'),
 'string'));
                                
$party->set_address_1($this->unmarshal($this->db->f('party_address_1'), 
'string'));

Modified: branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php     
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/inc/class.uicontract.inc.php     
2017-08-27 11:07:20 UTC (rev 17002)
@@ -1399,6 +1399,7 @@
                                
$contract->set_service_id(phpgw::get_var('service_id'));
                                
$contract->set_responsibility_id(phpgw::get_var('responsibility_id'));
                                
$contract->set_reference(phpgw::get_var('reference'));
+                               
$contract->set_customer_order_id(phpgw::get_var('customer_order_id', 'int'));
                                
$contract->set_invoice_header(phpgw::get_var('invoice_header'));
                                
$contract->set_account_in(phpgw::get_var('account_in'));
 
@@ -1769,6 +1770,7 @@
                                'value_billing_start' => $billing_start_date,
                                'value_billing_end' => $billing_end_date,
                                'value_reference' => $contract->get_reference(),
+                               'value_customer_order_id' => 
$contract->get_customer_order_id(),
                                'value_responsibility_id' => 
$cur_responsibility_id,
                                'value_service' => $contract->get_service_id(),
                                'value_account_in' => $account_in,
@@ -2289,6 +2291,7 @@
                                'value_billing_start' => $billing_start_date,
                                'value_billing_end' => $billing_end_date,
                                'value_reference' => $contract->get_reference(),
+                               'value_customer_order_id' => 
$contract->get_customer_order_id(),
                                'list_responsibility' => array('options' => 
$responsibility_options),
                                'value_responsibility_id' => 
$cur_responsibility_id,
                                'value_service' => $contract->get_service_id(),

Modified: 
branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php     
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php     
2017-08-27 11:07:20 UTC (rev 17002)
@@ -160,7 +160,7 @@
                                        $data['article_code'] = 
$price_item->get_agresso_id();
                                        $price_item_data[] = $data;
                                }
-                               $this->orders[] = 
$this->get_order($invoice->get_header(), 
$invoice->get_party()->get_identifier(), $invoice->get_id(), 
$this->billing_job->get_year(), $this->billing_job->get_month(), 
$invoice->get_account_out(), $price_item_data, 
$invoice->get_responsibility_id(), $invoice->get_service_id(), 
$building_location_code, $invoice->get_project_id(), $composite_name, 
$serial_number, $invoice->get_reference());
+                               $this->orders[] = 
$this->get_order($invoice->get_header(), 
$invoice->get_party()->get_identifier(), $invoice->get_id(), 
$this->billing_job->get_year(), $this->billing_job->get_month(), 
$invoice->get_account_out(), $price_item_data, 
$invoice->get_responsibility_id(), $invoice->get_service_id(), 
$building_location_code, $invoice->get_project_id(), $composite_name, 
$serial_number, $invoice->get_reference(), $invoice->get_customer_order_id());
                                $invoice->set_serial_number($serial_number);
                                $serial_number++;
                        }
@@ -292,9 +292,10 @@
 
                                        $this->orders[] = 
$this->$get_order_excel(
                                                $start_date, $end_date, 
$billing_start_date, $billing_end_date, $invoice->get_header(), 
$invoice->get_party()->get_identifier(), $party_name, 
$serialized_party['address'], $party_full_name, $invoice->get_id(), 
$this->billing_job->get_year(), $this->billing_job->get_month(), 
$invoice->get_account_out(), $data, $invoice->get_responsibility_id(), 
$invoice->get_service_id(), $building_location_code, 
$invoice->get_project_id(), $composite_name, $invoice->get_reference(), 
$price_item_counter, $invoice->get_account_in(), //ny
-         $invoice->get_responsibility_id(), //ny
-         $contract_type_label, //ny
-         $contract_id //ny
+                                               
$invoice->get_responsibility_id(), //ny
+                                               $contract_type_label, //ny
+                                               $contract_id, //ny
+                                               
$invoice->get_customer_order_id()
                                        );
                                        $price_item_counter++;
                                }
@@ -305,7 +306,7 @@
                 * Builds one single order of the Agresso file.
                 * 
                 */
-               protected function get_order( $header, $party_id, $order_id, 
$bill_year, $bill_month, $account, $product_items, $responsibility, $service, 
$building, $project, $text, $serial_number, $client_ref )
+               protected function get_order( $header, $party_id, $order_id, 
$bill_year, $bill_month, $account, $product_items, $responsibility, $service, 
$building, $project, $text, $serial_number, $client_ref, $customer_order_id )
                {
 
                        //$order_id = $order_id + 39500000;
@@ -489,7 +490,7 @@
                 * 
                 */
                protected function get_order_excel_bk(
-               $start_date, $end_date, $billing_start_date, $billing_end_date, 
$header, $party_id, $party_name, $party_address, $party_full_name, $order_id, 
$bill_year, $bill_month, $account, $product_item, $responsibility, $service, 
$building, $project, $text, $client_ref, $counter, $account_in, 
$responsibility_id, $contract_type_label, $contract_id )
+               $start_date, $end_date, $billing_start_date, $billing_end_date, 
$header, $party_id, $party_name, $party_address, $party_full_name, $order_id, 
$bill_year, $bill_month, $account, $product_item, $responsibility, $service, 
$building, $project, $text, $client_ref, $counter, $account_in, 
$responsibility_id, $contract_type_label, $contract_id, $customer_order_id )
                {
 
                        //$order_id = $order_id + 39500000;
@@ -501,6 +502,7 @@
                                'contract_id' => $contract_id,
                                'account' => $account,
                                'client_ref' => $client_ref,
+                               'customer order id' => $customer_order_id,
                                'header' => utf8_decode($header),
                                'bill_year' => $bill_year,
                                'bill_month' => $bill_month,
@@ -530,7 +532,7 @@
                }
 
                protected function get_order_excel_nlsh(
-               $start_date, $end_date, $billing_start_date, $billing_end_date, 
$header, $party_id, $party_name, $party_address, $party_full_name, $order_id, 
$bill_year, $bill_month, $account_out, $product_item, $responsibility, 
$service, $building, $project, $text, $client_ref, $counter, $account_in, 
$responsibility_id, $contract_type_label, $contract_id )
+               $start_date, $end_date, $billing_start_date, $billing_end_date, 
$header, $party_id, $party_name, $party_address, $party_full_name, $order_id, 
$bill_year, $bill_month, $account_out, $product_item, $responsibility, 
$service, $building, $project, $text, $client_ref, $counter, $account_in, 
$responsibility_id, $contract_type_label, $contract_id, $customer_order_id )
                {
                
                        $article_price = 
$this->prizebook[$product_item['article_code']];

Modified: branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php 
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/inc/model/class.contract.inc.php 
2017-08-27 11:07:20 UTC (rev 17002)
@@ -59,6 +59,7 @@
                protected $service_id;
                protected $responsibility_id;
                protected $reference;
+               protected $customer_order_id;
                protected $invoice_header;
                protected $account_in;
                protected $account_out;
@@ -159,6 +160,15 @@
                        return $this->old_contract_id;
                }
 
+               public function set_customer_order_id( $customer_order_id )
+               {
+                       $this->customer_order_id = $customer_order_id;
+               }
+
+               public function get_customer_order_id()
+               {
+                       return $this->customer_order_id;
+               }
                public function get_payer_id()
                {
                        return $this->payer_id;
@@ -938,6 +948,7 @@
                                'party' => $this->get_party_name(),
                                'department' => $this->get_party_department(),
                                'old_contract_id' => 
$this->get_old_contract_id(),
+                               'customer_order_id' => 
$this->get_customer_order_id(),
                                //'last_edited_by_current_user' => 
$this->get_last_edited_by_current_user() ? date($date_format.' h:i:s A', 
$this->get_last_edited_by_current_user()): '',
                                'last_edited_by_current_user' => 
$this->get_last_edited_by_current_user() ? date($date_format, 
$this->get_last_edited_by_current_user()) : '',
                                'payer_id' => $this->get_payer_id(),
@@ -1187,7 +1198,7 @@
                 * Fetch responsibility candidates on the form array(array('id' 
=> 1, 'name' => 'some text', 'selected' => 1|0))
                 * @return array
                 */
-               public function get_responsibility_arr( $selected )
+               public function get_responsibility_arr( $selected = 0 )
                {
                        if ($responsibility_arr = 
execMethod('rental.bogeneric.get_list', array('type' => 'responsibility_unit',
                                'selected' => $selected)))

Modified: branches/Version-2_0-branch/rental/inc/model/class.invoice.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/model/class.invoice.inc.php  
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/inc/model/class.invoice.inc.php  
2017-08-27 11:07:20 UTC (rev 17002)
@@ -32,6 +32,7 @@
                protected $billing_title;
                protected $serial_number;
                protected $reference;
+               protected $customer_order_id;
                public static $so;
 
                public function __construct( int $id, int $billing_id, int 
$contract_id, int $timestamp_created, int $timestamp_start, int $timestamp_end, 
float $total_sum, float $total_area, string $header, string $account_in, string 
$account_out, string $service_id, string $responsibility_id )
@@ -312,6 +313,16 @@
                        $this->reference = $reference;
                }
 
+               public function get_customer_order_id()
+               {
+                       return $this->customer_order_id;
+               }
+
+               public function set_customer_order_id( $customer_order_id )
+               {
+                       $this->customer_order_id = $customer_order_id;
+               }
+
                public function get_billing_title()
                {
                        return $this->billing_title;

Modified: branches/Version-2_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/rental/setup/phpgw_no.lang      2017-08-27 
11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/setup/phpgw_no.lang      2017-08-27 
11:07:20 UTC (rev 17002)
@@ -683,4 +683,5 @@
 select file to upload  rental  no      Velg fil for opplasting
 synchronized: %1       rental  no      Synkronisert: %1
 syncronize all rental  no      Synkroniser alle
-customer id    rental  no      Kundenummer
\ No newline at end of file
+customer id    rental  no      Kundenummer
+customer order id      rental  no      Kundens ordrenr.
\ No newline at end of file

Modified: branches/Version-2_0-branch/rental/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/setup.inc.php      2017-08-27 
11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/setup/setup.inc.php      2017-08-27 
11:07:20 UTC (rev 17002)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['rental']['name'] = 'rental';  // Module identifier
-       $setup_info['rental']['version'] = '0.1.0.38'; // Current module version
+       $setup_info['rental']['version'] = '0.1.0.39'; // Current module version
        $setup_info['rental']['app_order'] = 51;  // (?)
        $setup_info['rental']['tables'] = array(
                'rental_party', // All contract participants, tenants etc.

Modified: branches/Version-2_0-branch/rental/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/tables_current.inc.php     
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/setup/tables_current.inc.php     
2017-08-27 11:07:20 UTC (rev 17002)
@@ -155,6 +155,7 @@
                                'service_id' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => true), //Tjeneste
                                'responsibility_id' => array('type' => 
'varchar', 'precision' => '255', 'nullable' => true), //Ansvar
                                'reference' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => true),
+                               'customer_order_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => true),
                                'invoice_header' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => true),
                                'account_in' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => true),
                                'account_out' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => true),

Modified: branches/Version-2_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/tables_update.inc.php      
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/setup/tables_update.inc.php      
2017-08-27 11:07:20 UTC (rev 17002)
@@ -995,3 +995,21 @@
                        return $GLOBALS['setup_info']['rental']['currentver'];
                }
        }
+
+       $test[] = '0.1.0.38';
+       function rental_upgrade0_1_0_38()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw_setup']->oProc->AddColumn('rental_contract', 
'customer_order_id', array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => true
+               ));
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['rental']['currentver'] = 
'0.1.0.39';
+                       return $GLOBALS['setup_info']['rental']['currentver'];
+               }
+       }

Modified: branches/Version-2_0-branch/rental/templates/base/contract.xsl
===================================================================
--- branches/Version-2_0-branch/rental/templates/base/contract.xsl      
2017-08-27 11:06:06 UTC (rev 17001)
+++ branches/Version-2_0-branch/rental/templates/base/contract.xsl      
2017-08-27 11:07:20 UTC (rev 17002)
@@ -159,6 +159,12 @@
                                                        </label>
                                                        <input type="text" 
name="reference" value="{value_reference}"></input>
                                                </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'customer order id')"/>
+                                                       </label>
+                                                       <input type="number" 
step="1" name="customer_order_id" value="{value_customer_order_id}"></input>
+                                               </div>
                                        </div>
                                        <div class="pure-u-1 pure-u-lg-1-2">
                                                <div class="pure-control-group">




reply via email to

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