[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16428] Stable: Merge 16426:16427 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16428] Stable: Merge 16426:16427 from trunk |
|
Date: |
Sun, 12 Mar 2017 13:59:36 -0400 (EDT) |
Revision: 16428
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16428
Author: sigurdne
Date: 2017-03-12 13:59:36 -0400 (Sun, 12 Mar 2017)
Log Message:
-----------
Stable: Merge 16426:16427 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-03-12 17:58:36 UTC (rev 16427)
+++ branches/Version-2_0-branch 2017-03-12 17:59:36 UTC (rev 16428)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16394
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
2017-03-12 17:58:36 UTC (rev 16427)
+++ branches/Version-2_0-branch/rental/inc/class.uibilling.inc.php
2017-03-12 17:59:36 UTC (rev 16428)
@@ -1714,7 +1714,7 @@
$count_keys =
count($keys);
for ($j = 0; $j <
$count_keys; $j++)
{
-
array_push($headings, lang($keys[$j]));
+
array_push($headings, ltrim(lang($keys[$j]), '!'));
}
// _debug_array($list);
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-03-12 17:58:36 UTC (rev 16427)
+++ branches/Version-2_0-branch/rental/inc/model/class.agresso_lg04.inc.php
2017-03-12 17:59:36 UTC (rev 16428)
@@ -9,6 +9,7 @@
protected $billing_job;
protected $date_str;
protected $orders;
+ protected $prizebook;
public function __construct( $billing_job )
{
@@ -175,8 +176,30 @@
return $so_invoice->transaction_commit();
}
+
+ function get_prizebook()
+ {
+ $this->prizebook = array();
+ $db = $GLOBALS['phpgw']->db;
+ $sql = "SELECT id, agresso_id, price, type FROM
rental_price_item";
+ $db->query($sql);
+ while($db->next_record())
+ {
+ $agresso_id = $db->f('agresso_id');
+
+ $entry = array(
+ 'price' => $db->f('price'),
+ 'type' => $db->f('type'),
+ );
+ $this->prizebook[$agresso_id] = $entry;
+ }
+ }
+
protected function run_excel_export( $excel_export_type )
{
+
+ $this->get_prizebook();
+
switch ($excel_export_type)
{
case 'bk':
@@ -509,7 +532,26 @@
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 )
{
+
+ $article_price =
$this->prizebook[$product_item['article_code']];
+ switch ($article_price['type'])
+ {
+ case '1'://year
+ $monthly_rent = $article_price['price']
/ 12;
+ break;
+ case '2'://Month
+ $monthly_rent = $article_price['price'];
+ break;
+ case '3'://day
+ $monthly_rent = $article_price['price']
* 30;
+ break;
+ default:
+ $monthly_rent = '';
+ break;
+ }
+
+// _debug_array($product_item);
//_debug_array(func_get_args());
$item_counter = $counter;
$order = array
@@ -533,6 +575,7 @@
'address' => $party_address,
'Leieboer' => $party_full_name,
'amount' =>
$this->get_formatted_amount_excel($product_item['amount']),
+ 'Mnd leie' =>
$this->get_formatted_amount_excel($monthly_rent),
'article description' =>
$product_item['article_description'],
'article_code' => $product_item['article_code'],
'batch_id' => "BKBPE{$this->date_str}",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16428] Stable: Merge 16426:16427 from trunk,
sigurdne <=