[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17016] FDV-230 and FDV-231
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17016] FDV-230 and FDV-231 |
|
Date: |
Thu, 31 Aug 2017 06:51:08 -0400 (EDT) |
Revision: 17016
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17016
Author: sigurdne
Date: 2017-08-31 06:51:08 -0400 (Thu, 31 Aug 2017)
Log Message:
-----------
FDV-230 and FDV-231
Modified Paths:
--------------
trunk/rental/inc/class.soinvoice.inc.php
trunk/rental/inc/class.soparty.inc.php
trunk/rental/inc/class.uiparty.inc.php
trunk/rental/inc/model/class.agresso_lg04.inc.php
Modified: trunk/rental/inc/class.soinvoice.inc.php
===================================================================
--- trunk/rental/inc/class.soinvoice.inc.php 2017-08-31 09:55:48 UTC (rev
17015)
+++ trunk/rental/inc/class.soinvoice.inc.php 2017-08-31 10:51:08 UTC (rev
17016)
@@ -62,7 +62,24 @@
}
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, contract.customer_order_id';
+ $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, party.customer_id,'
+ . ' 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
{
@@ -110,6 +127,7 @@
$party->set_last_name($this->unmarshal($this->db->f('party_last_name'),
'string'));
$party->set_location_id($this->unmarshal($this->db->f('party_org_location_id'),
'int'));
$party->set_identifier($this->unmarshal($this->db->f('party_identifier'),
'string'));
+
$party->set_customer_id($this->unmarshal($this->db->f('customer_id'), 'int'));
$party->set_mobile_phone($this->unmarshal($this->db->f('party_mobile_phone'),
'string'));
$party->set_place($this->unmarshal($this->db->f('party_place'), 'string'));
$party->set_postal_code($this->unmarshal($this->db->f('party_postal_code'),
'string'));
Modified: trunk/rental/inc/class.soparty.inc.php
===================================================================
--- trunk/rental/inc/class.soparty.inc.php 2017-08-31 09:55:48 UTC (rev
17015)
+++ trunk/rental/inc/class.soparty.inc.php 2017-08-31 10:51:08 UTC (rev
17016)
@@ -120,6 +120,9 @@
case "result_unit_number":
$like_clauses[] =
"party.result_unit_number $this->like $like_pattern";
break;
+ case "customer_id":
+ $like_clauses[] =
"party.customer_id = " . (int)$search_for;
+ break;
case "all":
$like_clauses[] =
"party.first_name $this->like $like_pattern";
$like_clauses[] =
"party.last_name $this->like $like_pattern";
@@ -131,6 +134,7 @@
$like_clauses[] =
"party.identifier $this->like $like_pattern";
$like_clauses[] =
"party.comment $this->like $like_pattern";
$like_clauses[] =
"party.reskontro $this->like $like_pattern";
+ $like_clauses[] =
"party.customer_id = " . (int)$search_for;
break;
}
Modified: trunk/rental/inc/class.uiparty.inc.php
===================================================================
--- trunk/rental/inc/class.uiparty.inc.php 2017-08-31 09:55:48 UTC (rev
17015)
+++ trunk/rental/inc/class.uiparty.inc.php 2017-08-31 10:51:08 UTC (rev
17016)
@@ -49,6 +49,7 @@
array('id' => 'name', 'name' => lang('name')),
array('id' => 'address', 'name' =>
lang('address')),
array('id' => 'identifier', 'name' =>
lang('identifier')),
+ array('id' => 'customer_id', 'name' =>
lang('customer id') . ' (Agresso)'),
array('id' => 'reskontro', 'name' =>
lang('reskontro')),
array('id' => 'result_unit_number', 'name' =>
lang('result_unit_number')),
);
@@ -494,6 +495,13 @@
'hidden' => false
),
array(
+ 'key' => 'customer_id',
+ 'label' =>
lang('customer id') . ' (Agresso)',
+ 'className' => '',
+ 'sortable' => true,
+ 'hidden' => false
+ ),
+ array(
'key' => 'name',
'label' => lang('name'),
'className' => '',
Modified: trunk/rental/inc/model/class.agresso_lg04.inc.php
===================================================================
--- trunk/rental/inc/model/class.agresso_lg04.inc.php 2017-08-31 09:55:48 UTC
(rev 17015)
+++ trunk/rental/inc/model/class.agresso_lg04.inc.php 2017-08-31 10:51:08 UTC
(rev 17016)
@@ -295,7 +295,8 @@
$invoice->get_responsibility_id(), //ny
$contract_type_label, //ny
$contract_id, //ny
-
$invoice->get_customer_order_id()
+
$invoice->get_customer_order_id(),
+ $serialized_party['customer_id']
);
$price_item_counter++;
}
@@ -490,7 +491,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, $customer_order_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,
$customer_id )
{
//$order_id = $order_id + 39500000;
@@ -501,6 +502,7 @@
$order = array(
'contract_id' => $contract_id,
'account' => $account,
+ 'customer id' => $customer_id,
'client_ref' => $client_ref,
'customer order id' => $customer_order_id,
'header' => utf8_decode($header),
@@ -532,7 +534,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, $customer_order_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,
$customer_id )
{
$article_price =
$this->prizebook[$product_item['article_code']];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17016] FDV-230 and FDV-231,
sigurdne <=