[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16693] Stable: Merge 16687:16692 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16693] Stable: Merge 16687:16692 from trunk |
|
Date: |
Thu, 4 May 2017 17:17:00 -0400 (EDT) |
Revision: 16693
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16693
Author: sigurdne
Date: 2017-05-04 17:17:00 -0400 (Thu, 04 May 2017)
Log Message:
-----------
Stable: Merge 16687:16692 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.sovendor.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.vendor.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/helpdesk/js/portico/tts.add.js
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_ldap.inc.php
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_sql.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
branches/Version-2_0-branch/property/js/portico/project.edit.js
branches/Version-2_0-branch/property/templates/base/project.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch 2017-05-04 21:17:00 UTC (rev 16693)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/eventplanner/inc/class.sovendor.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.sovendor.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/eventplanner/inc/class.sovendor.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -115,4 +115,17 @@
return $this->db->transaction_commit();
}
+ function check_duplicate_organization($organization_number =
false)
+ {
+ if(!$organization_number)
+ {
+ return false;
+ }
+
+ $query = $this->db->db_addslashes($organization_number);
+ $sql = "SELECT name FROM eventplanner_vendor WHERE
organization_number = '{$query}'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ return $this->db->f('name', true);
+ }
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.vendor.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/model/class.vendor.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/eventplanner/inc/model/class.vendor.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -264,6 +264,16 @@
}
}
+ protected function doValidate( $entity, &$errors )
+ {
+ $organization_number = $entity->organization_number;
+ $duplicate_name =
eventplanner_sovendor::get_instance()->check_duplicate_organization($organization_number);
+ if ($duplicate_name)
+ {
+ $errors['organization_number'] =
lang('organization number already exists for %1', $duplicate_name);
+ }
+ }
+
protected function generate_secret( $length = 10 )
{
return substr(base64_encode(rand(1000000000,
9999999999)), 0, $length);
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-05-04 21:17:00 UTC (rev 16693)
@@ -121,4 +121,5 @@
days eventplanner no dager
hours eventplanner no Timer
there is a minimum interval of %1 hours eventplanner no Det er
et minimumsintervall på %1 time(r)
-summary eventplanner no kortversjon programbeskrivelse
\ No newline at end of file
+summary eventplanner no kortversjon programbeskrivelse
+organization number already exists for %1 eventplanner no
Organisasjonsnummeret er allerede registrert på %1.
\ No newline at end of file
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -51,7 +51,8 @@
'columns' => true,
'update_data' => true,
'upload_clip' => true,
- 'view_image' => true
+ 'view_image' => true,
+ 'get_reverse_assignee'=>true
);
/**
@@ -179,6 +180,33 @@
}
}
+ /**
+ * called as ajax from edit form
+ *
+ * @param string $query
+ *
+ * @return array
+ */
+ public function get_reverse_assignee()
+ {
+ $query = phpgw::get_var('query');
+
+ $filter = array('active' => 1);
+
+ $account_list =
$GLOBALS['phpgw']->accounts->get_list('accounts', -1,'ASC', 'account_lastname',
$query, false, $filter);
+
+ $values = array();
+
+ foreach ($account_list as $account)
+ {
+ $values[] = array(
+ 'id' => $account->id,
+ 'name' => $account->__toString()
+ );
+ }
+ return array('ResultSet' => array('Result' => $values));
+ }
+
function get_params()
{
$search = phpgw::get_var('search');
Modified: branches/Version-2_0-branch/helpdesk/js/portico/tts.add.js
===================================================================
--- branches/Version-2_0-branch/helpdesk/js/portico/tts.add.js 2017-05-04
21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/helpdesk/js/portico/tts.add.js 2017-05-04
21:17:00 UTC (rev 16693)
@@ -262,4 +262,8 @@
};
}
-});
\ No newline at end of file
+});
+
+var oArgs = {menuaction: 'helpdesk.uitts.get_reverse_assignee'};
+var strURL = phpGWLink('index.php', oArgs, true);
+JqueryPortico.autocompleteHelper(strURL, 'reverse_name', 'reverse_id',
'reverse_container');
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-05-04
21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-05-04
21:17:00 UTC (rev 16693)
@@ -199,4 +199,5 @@
select helpdesk no Velg
modified helpdesk no Endret
sent helpdesk no Sendt
-generic helpdesk no Generelt
\ No newline at end of file
+generic helpdesk no Generelt
+reverse helpdesk no Revers tildeling
\ No newline at end of file
Modified: branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-05-04
21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-05-04
21:17:00 UTC (rev 16693)
@@ -87,6 +87,18 @@
<xsl:call-template name="user_id_select"/>
</div>
</xsl:if>
+ <div class="pure-control-group">
+ <xsl:variable
name="lang_reverse">
+ <xsl:value-of
select="php:function('lang', 'reverse')"/>
+ </xsl:variable>
+ <label>
+ <xsl:value-of
select="$lang_reverse"/>
+ </label>
+ <input type="hidden"
id="reverse_id" name="values[reverse_id]" value="{value_reverse_id}"/>
+ <input type="text"
id="reverse_name" name="values[reverse_name]" value="{value_reverse_name}"
class="pure-input-1-2">
+ </input>
+ <div
id="reverse_container"/>
+ </div>
<!--xsl:call-template
name="contact_form"/-->
<!--div
class="pure-control-group">
<label>
Modified:
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -215,7 +215,7 @@
* @return array list of accounts that match criteria
*/
abstract public function get_list($_type='both', $start = -1,
$sort = '',
-
$order = '', $query = '', $offset = -1);
+
$order = '', $query = '', $offset = -1, $filter = array());
/**
* Convert an account login id to an account id
Modified:
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_ldap.inc.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_ldap.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_ldap.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -307,7 +307,7 @@
* @param integer $offset Offset from start position (-1 == no
limit)
* @return array|boolean List with all accounts|groups or false
*/
- public function get_list($_type = 'both', $start = -1, $sort =
'', $order = '', $query = '', $offset = -1)
+ public function get_list($_type = 'both', $start = -1, $sort =
'', $order = '', $query = '', $offset = -1, $filter = array())
{
//echo "accounts_ldap:get_list($_type, $start, $sort,
$order, $query, $offset) called<br>";
$query = strtolower($query);
Modified:
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_sql.inc.php
===================================================================
---
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_sql.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++
branches/Version-2_0-branch/phpgwapi/inc/accounts/class.accounts_sql.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -437,7 +437,7 @@
* @return array list of accounts that match criteria
*/
public function get_list($_type='both', $start = -1, $sort = '',
- $order = '',
$query = '', $offset = -1)
+ $order = '',
$query = '', $offset = -1, $filter = array())
{
// For XML-RPC
/* if (is_array($_type))
@@ -468,26 +468,30 @@
}
$whereclause = '';
+
+ $where = 'WHERE';
+
+ if($filter['active'] == 1)
+ {
+ $whereclause = "{$where} account_status = 'A'";
+ $where = 'AND';
+ }
+
switch($_type)
{
case 'accounts':
- $whereclause = "WHERE account_type =
'u'";
+ $whereclause .= " {$where} account_type
= 'u'";
+ $where = 'AND';
break;
case 'groups':
- $whereclause = "WHERE account_type =
'g'";
+ $whereclause .= " {$where} account_type
= 'g'";
+ $where = 'AND';
break;
}
if ($query)
{
- if ($whereclause)
- {
- $whereclause .= ' AND (';
- }
- else
- {
- $whereclause = ' WHERE (';
- }
+ $whereclause .= " {$where} (";
if(ctype_digit($query))
{
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-05-04
21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-05-04
21:17:00 UTC (rev 16693)
@@ -281,7 +281,7 @@
*/
function get_offset($sql = '', $offset, $num_rows = 0)
{
- $offset = (int)$offset;
+ $offset = $offset < 0 ? 0 : (int)$offset;
$num_rows = (int)$num_rows;
if ($num_rows == 0)
Modified: branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -1822,8 +1822,8 @@
array('key' => 'vendor', 'label' =>
lang('vendor'), 'sortable' => false),
array('key' => 'amount', 'label' =>
lang('amount'), 'sortable' => true, 'className' => 'right',
'formatter' =>
'JqueryPortico.FormatterAmount2'),
- array('key' => 'approved_amount', 'label' =>
lang('approved amount'), 'sortable' => false,
- 'className' => 'right', 'formatter' =>
'JqueryPortico.FormatterAmount2'),
+// array('key' => 'approved_amount', 'label' =>
lang('approved amount'), 'sortable' => false,
+// 'className' => 'right', 'formatter' =>
'JqueryPortico.FormatterAmount2'),
array('key' => 'period', 'label' =>
lang('period'), 'sortable' => true),
array('key' => 'periodization', 'label' =>
lang('periodization'), 'sortable' => false),
array('key' => 'periodization_start', 'label'
=> lang('periodization start'),
@@ -2319,9 +2319,20 @@
foreach ($invoices as $entry)
{
+
+
if(isset($config->config_data['invoicehandler']) &&
$config->config_data['invoicehandler'] == 2)
+ {
+ $voucher_id = $entry['transfer_time'] ?
-1 * $entry['voucher_id'] : $entry['voucher_id'];
+ }
+ else
+ {
+ $voucher_id =
$entry['external_voucher_id'];
+ }
+
+
$values[] = array
(
- 'voucher_id' => $entry['transfer_time']
? -1 * $entry['voucher_id'] : $entry['voucher_id'],
+ 'voucher_id' => $voucher_id,
'voucher_out_id' =>
$entry['voucher_out_id'],
'workorder_id' =>
$entry['workorder_id'],
'status' => $entry['status'],
Modified: branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -1834,6 +1834,7 @@
if ($config->config_data['invoicehandler'] == 2)
{
+ $voucher_id = $entry['transfer_time'] ?
-1 * $entry['voucher_id'] : $entry['voucher_id'];
if ($entry['voucher_id'] > 0)
{
$link_data_invoice2['voucher_id'] = $entry['voucher_id'];
@@ -1849,24 +1850,27 @@
else
{
$_disable_link = true;
- if ($entry['voucher_id'] > 0)
- {
-
$link_data_invoice1['voucher_id'] = $entry['voucher_id'];
- $link_data_invoice1['query'] =
$entry['voucher_id'];
- $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
- }
- else
- {
-
$link_data_invoice1['voucher_id'] = abs($entry['voucher_id']);
- $link_data_invoice1['paid'] =
'true';
- $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
- }
+ $voucher_id =
$entry['external_voucher_id'];
+
+// if ($entry['voucher_id'] > 0)
+// {
+//
$link_data_invoice1['voucher_id'] = $entry['voucher_id'];
+// $link_data_invoice1['query'] =
$entry['voucher_id'];
+// $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
+// }
+// else
+// {
+//
$link_data_invoice1['voucher_id'] = abs($entry['voucher_id']);
+// $link_data_invoice1['paid'] =
'true';
+// $url =
$GLOBALS['phpgw']->link('/index.php', $link_data_invoice1);
+// }
}
+
$link_voucher_id = "<a href='" . $url . "'>" .
$voucher_out_id . "</a>";
$content_invoice[] = array
- (
- 'voucher_id' => ($_disable_link) ?
$entry['voucher_id'] : $link_voucher_id,
+ (
+ 'voucher_id' => ($_disable_link) ?
$voucher_id : $link_voucher_id,
'voucher_out_id' =>
$entry['voucher_out_id'],
'status' => $entry['status'],
'period' => $entry['period'],
@@ -1972,13 +1976,13 @@
'sortable' => true,
'className' => 'right',
'value_footer' =>
number_format($amount, 2, $this->decimal_separator, '.')),
+// array(
+// 'key' => 'approved_amount',
+// 'label' => lang('approved amount'),
+// 'sortable' => true,
+// 'className' => 'right',
+// 'value_footer' =>
number_format($approved_amount, 2, $this->decimal_separator, '.')),
array(
- 'key' => 'approved_amount',
- 'label' => lang('approved amount'),
- 'sortable' => true,
- 'className' => 'right',
- 'value_footer' =>
number_format($approved_amount, 2, $this->decimal_separator, '.')),
- array(
'key' => 'period',
'label' => lang('period'),
'sortable' => true),
Modified:
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
===================================================================
---
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
2017-05-04 21:12:55 UTC (rev 16692)
+++
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
2017-05-04 21:17:00 UTC (rev 16693)
@@ -48,6 +48,7 @@
protected $skip_email = false;
protected $export;
protected $skip_update_voucher_id = false;
+ protected $order_id;
function __construct()
{
@@ -129,6 +130,7 @@
else
{
$this->db->transaction_commit();
+
phpgwapi_cache::system_clear('property', "budget_order_{$this->order_id}");
}
}
else
@@ -368,6 +370,7 @@
{
$buffer[$i]['project_id'] =
$this->soXport->get_project($_order_id);
$order_id = $_order_id;
+ $this->order_id = $order_id;
}
$buffer[$i]['external_voucher_id'] =
$_data['KEY']; // => 1400050146
@@ -519,7 +522,7 @@
try
{
$bilagsnr =
$this->import_end_file($buffer);
-
+
if($this->config->config_data['export']['auto_receive_order'])
{
$received_amount =
$this->get_total_received((int)$order_id);
@@ -620,7 +623,7 @@
throw new Exception("{$order_type} not
supported");
break;
}
-
+
$this->db->query($sql, __LINE__, __FILE__);
if ($this->db->next_record())
{
Modified: branches/Version-2_0-branch/property/js/portico/project.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-05-04 21:17:00 UTC (rev 16693)
@@ -107,7 +107,7 @@
i : 0;
};
- var columns = ["4", "5"];
+ var columns = ["4"];
columns.forEach(function (col)
{
Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl
2017-05-04 21:12:55 UTC (rev 16692)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl
2017-05-04 21:17:00 UTC (rev 16693)
@@ -390,7 +390,7 @@
<xsl:value-of
select="php:function('lang', 'external project')"/>
</label>
<input type="hidden"
id="external_project_id" name="values[external_project_id]"
value="{value_external_project_id}"/>
- <input type="text"
id="external_project_name" name="values[external_project_name]"
value="{value_external_project_name}"/>
+ <input type="text"
id="external_project_name" name="values[external_project_name]"
value="{value_external_project_name}" class="pure-input-1-2"/>
<div
id="external_project_container"/>
</div>
@@ -411,7 +411,7 @@
<xsl:if test="mode='edit'">
<input type="hidden"
id="ecodimb" name="values[ecodimb]" value="{ecodimb_data/value_ecodimb}"/>
</xsl:if>
- <input type="text"
id="ecodimb_name" name="values[ecodimb_name]"
value="{ecodimb_data/value_ecodimb} {ecodimb_data/value_ecodimb_descr}">
+ <input type="text"
id="ecodimb_name" name="values[ecodimb_name]"
value="{ecodimb_data/value_ecodimb} {ecodimb_data/value_ecodimb_descr}"
class="pure-input-1-2">
<xsl:choose>
<xsl:when
test="mode='edit'">
<xsl:attribute name="data-validation">
@@ -439,7 +439,7 @@
<xsl:value-of
select="$lang_budget_account"/>
</label>
<input type="hidden"
id="b_account_group" name="values[b_account_group]"
value="{b_account_group_data/value_b_account_id}"/>
- <input type="text"
id="b_account_group_name" name="values[b_account_group_name]"
value="{b_account_group_data/value_b_account_name}">
+ <input type="text"
id="b_account_group_name" name="values[b_account_group_name]"
value="{b_account_group_data/value_b_account_name}" class="pure-input-1-2">
<xsl:choose>
<xsl:when test="mode='edit'">
<xsl:attribute name="data-validation">
@@ -469,7 +469,7 @@
<xsl:value-of
select="$lang_budget_account"/>
</label>
<input type="hidden"
id="b_account_id" name="values[b_account_id]"
value="{b_account_data/value_b_account_id}"/>
- <input type="text"
id="b_account_name" name="values[b_account_name]"
value="{b_account_data/value_b_account_id}
{b_account_data/value_b_account_name}">
+ <input type="text"
id="b_account_name" name="values[b_account_name]"
value="{b_account_data/value_b_account_id}
{b_account_data/value_b_account_name}" class="pure-input-1-2">
<xsl:choose>
<xsl:when test="mode='edit'">
<xsl:attribute name="data-validation">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16693] Stable: Merge 16687:16692 from trunk,
sigurdne <=