[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9375] Merge 9367:9374 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9375] Merge 9367:9374 from trunk |
|
Date: |
Fri, 11 May 2012 11:36:14 +0000 |
Revision: 9375
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9375
Author: sigurdne
Date: 2012-05-11 11:36:14 +0000 (Fri, 11 May 2012)
Log Message:
-----------
Merge 9367:9374 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
Added Paths:
-----------
branches/Version-1_0-branch/controller/images/back_arrow.png
branches/Version-1_0-branch/controller/images/left_arrow.png
branches/Version-1_0-branch/controller/images/left_arrow.psd
branches/Version-1_0-branch/controller/images/right_arrow.png
branches/Version-1_0-branch/controller/images/right_arrow.psd
branches/Version-1_0-branch/controller/images/up_arrow.png
branches/Version-1_0-branch/controller/images/up_arrow.psd
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374
Copied: branches/Version-1_0-branch/controller/images/back_arrow.png (from rev
9374, trunk/controller/images/back_arrow.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/left_arrow.png (from rev
9374, trunk/controller/images/left_arrow.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/left_arrow.psd (from rev
9374, trunk/controller/images/left_arrow.psd)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/right_arrow.png (from rev
9374, trunk/controller/images/right_arrow.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/right_arrow.psd (from rev
9374, trunk/controller/images/right_arrow.psd)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/up_arrow.png (from rev
9374, trunk/controller/images/up_arrow.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/up_arrow.psd (from rev
9374, trunk/controller/images/up_arrow.psd)
===================================================================
(Binary files differ)
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-11 11:34:54 UTC (rev 9374)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-11 11:36:14 UTC (rev 9375)
@@ -8,7 +8,8 @@
<div id="control_plan">
<div class="top">
<h1>Kontrollplan for bygg/eiendom: <xsl:value-of
select="current_location/loc1_name"/></h1>
- <h3>Kalenderoversikt for <xsl:value-of
select="current_month"/><span class="year"><xsl:value-of
select="current_year"/></span></h3>
+ <xsl:variable name="month_str">month <xsl:value-of
select="current_month_nr"/> capitalized</xsl:variable>
+ <h3>Kalenderoversikt for <xsl:value-of
select="php:function('lang', $month_str)" /><span class="year"><xsl:value-of
select="current_year"/></span></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -50,35 +51,80 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
- Årsoversikt
+ <img height="25"
src="controller/images/up_arrow.png" />Årsoversikt
</a>
<div id="calNav">
- <a class="showPrev month">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of
select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of
select="current_month - 1"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="$location_code"/>
- </xsl:attribute>
- <xsl:variable name="month_str">month
<xsl:value-of select="current_month_nr - 1"/> capitalized</xsl:variable>
+ <xsl:choose>
+ <xsl:when test="current_month_nr > 1">
+ <a class="showPrev month">
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr - 1"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+ </xsl:attribute>
+ <img height="17"
src="controller/images/left_arrow.png" />
+ <xsl:variable
name="month_str">month <xsl:value-of select="current_month_nr - 1"/>
capitalized</xsl:variable>
+ <xsl:value-of
select="php:function('lang', $month_str)" />
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a class="showPrev month">
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year - 1"/>
+
<xsl:text>&month=12</xsl:text>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+ </xsl:attribute>
+ <img height="17"
src="controller/images/left_arrow.png" />
+ <xsl:variable
name="month_str">month 12 capitalized</xsl:variable>
+ <xsl:value-of
select="php:function('lang', $month_str)" />
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <span class="current">
+ <xsl:variable name="month_str">month
<xsl:value-of select="current_month_nr"/> capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
- </a>
- <a class="showNext">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of
select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of
select="current_month_nr + 1"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="$location_code"/>
- </xsl:attribute>
- <xsl:variable name="month_str">month
<xsl:value-of select="current_month_nr + 1"/> capitalized</xsl:variable>
- <xsl:value-of
select="php:function('lang', $month_str)" />
- </a>
+ </span>
+ <xsl:choose>
+ <xsl:when test="12 > current_month_nr">
+ <a class="showNext">
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr + 1"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+ </xsl:attribute>
+ <xsl:variable
name="month_str">month <xsl:value-of select="current_month_nr + 1"/>
capitalized</xsl:variable>
+ <xsl:value-of
select="php:function('lang', $month_str)" />
+ <img height="17"
src="controller/images/right_arrow.png" />
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a class="showNext">
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year + 1"/>
+
<xsl:text>&month=1</xsl:text>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+ </xsl:attribute>
+ <xsl:variable
name="month_str">month 1 capitalized</xsl:variable>
+ <xsl:value-of
select="php:function('lang', $month_str)" />
+ <img height="17"
src="controller/images/right_arrow.png" />
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<!--
<select id="loc_1" class="choose_loc">
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-11 11:34:54 UTC (rev 9374)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-11 11:36:14 UTC (rev 9375)
@@ -51,7 +51,6 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
-
<xsl:value-of select="current_year -
1"/>
</a>
<a class="showNext">
@@ -62,7 +61,6 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
-
<xsl:value-of select="current_year +
1"/>
</a>
</div>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-11 11:34:54 UTC (rev 9374)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-11 11:36:14 UTC (rev 9375)
@@ -909,9 +909,7 @@
/* ====================== CALENDAR ========================== */
-#control_plan .top h1{
-
-}
+
#control_plan .top h3{
margin:0;
font-size:19px;
@@ -962,7 +960,7 @@
text-align: center;
}
#calendar.month th, #calendar.month td {
- padding: 5px;
+ padding: 5px 3px;
}
#calendar .even {
background: none repeat scroll 0 0 #DEEAF8;
@@ -980,9 +978,12 @@
padding: 0 10px;
width: 100px;
}
+#calendar .title, #calendar .assigned {
+ width: 150px;
+}
#calendar .frequency {
margin-right: 10px;
- width: 65px;
+ width: 100px;
}
#calendar .frequency, #calendar .title, #calendar .assigned, #calendar
.location_name {
text-align: left;
@@ -1003,25 +1004,46 @@
font-size: 14px;
float:left;
}
+#showYear img {
+ margin-right: 5px;
+ vertical-align: bottom;
+}
#calNav {
clear: both;
font-size: 14px;
font-weight: bold;
padding-top: 1em;
}
+#calNav img{
+ vertical-align:bottom;
+}
+
#calNav a.showNext{
display: block;
float: right;
-
+ padding-top: 5px;
}
+#calNav a.showNext img{
+ margin-left:5px;
+}
#calNav a.showPrev {
display: block;
float: left;
margin-left: 547px;
+ padding-left: 3px;
+ padding-top: 5px;
+ vertical-align: sub;
}
+#calNav a.showPrev img{
+ margin-right:5px;
+}
#calNav a.showPrev.month {
- margin-left: 446px;
+ margin-left: 437px;
}
+#calNav .current {
+ font-size: 21px;
+ padding-left: 230px;
+}
/* ====================== CALENDAR INFO BOX ========================== */
a.view_info_box {
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-05-11 11:34:54 UTC (rev 9374)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-05-11 11:36:14 UTC (rev 9375)
@@ -1182,7 +1182,6 @@
$type_id =
count($location_types);
}
$cols.= ",fm_location1.loc1_name";
- $this->join = $this->socommon->join;
$joinmethod .= " {$this->join} fm_location1 ON
($entity_table.loc1 = fm_location1.loc1))";
$paranthesis .='(';
$joinmethod .= " {$this->join} fm_part_of_town
ON (fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id))";
@@ -1207,7 +1206,7 @@
// if($_level > 1) // very expensive
if($_level == 2 && in_array(2,
$list_location_level))
{
- $joinmethod .= " {$this->join}
fm_location{$_level}";
+ $joinmethod .= " {$this->left_join}
fm_location{$_level}";
$paranthesis .='(';
$on = 'ON';
for ($k=($_level-1); $k>0; $k--)
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-05-11 11:34:54 UTC (rev 9374)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-05-11 11:36:14 UTC (rev 9375)
@@ -214,19 +214,19 @@
if ( (int)
$GLOBALS['phpgw_info']['server']['invoice_mail_reminder_time'] < (time() -
(3600 * 24)) )
{
$toarray = array();
- $sql = 'SELECT DISTINCT oppsynsmannid as
responsible FROM fm_ecobilag WHERE oppsynsmannid IS NOT NULL';
+ $sql = 'SELECT DISTINCT oppsynsmannid as
responsible FROM fm_ecobilag WHERE oppsynsigndato IS NULL AND oppsynsmannid IS
NOT NULL';
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record())
{
$toarray[$this->db->f('responsible')] =
true;
}
- $sql = 'SELECT DISTINCT saksbehandlerid as
responsible FROM fm_ecobilag WHERE saksbehandlerid IS NOT NULL';
+ $sql = 'SELECT DISTINCT saksbehandlerid as
responsible FROM fm_ecobilag WHERE saksigndato IS NULL AND saksbehandlerid IS
NOT NULL';
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record())
{
$toarray[$this->db->f('responsible')] =
true;
}
- $sql = 'SELECT DISTINCT budsjettansvarligid as
responsible FROM fm_ecobilag WHERE budsjettansvarligid IS NOT NULL';
+ $sql = 'SELECT DISTINCT budsjettansvarligid as
responsible FROM fm_ecobilag WHERE saksigndato IS NOT NULL AND budsjettsigndato
IS NULL AND budsjettansvarligid IS NOT NULL';
$this->db->query($sql,__LINE__,__FILE__);
while($this->db->next_record())
Modified: branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
===================================================================
--- branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
2012-05-11 11:34:54 UTC (rev 9374)
+++ branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
2012-05-11 11:36:14 UTC (rev 9375)
@@ -2,176 +2,19 @@
// When janitor is selected, vouchers are fetched from db and voucer
select list is populated
$("#janitor_lid").change(function () {
-// var janitor_lid = $(this).val();
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
-
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
-
+ update_voucher_filter();
});
$("#supervisor_lid").change(function () {
-// var janitor_lid = $(this).val();
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
-
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
-
+ update_voucher_filter();
});
$("#budget_responsible_lid").change(function () {
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
-
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
-
+ update_voucher_filter();
});
-
$("#search").click(function(e){
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
+ update_voucher_filter();
});
$("#voucher_id_filter").change(function () {
@@ -185,17 +28,12 @@
$("#invoice_id").html( '' );
$("#kid_nr").html( '' );
$("#vendor").html('' );
-// $("#janitor").html( '' );
-// $("#supervisor").html( '' );
-// $("#budget_responsible").html( '' );
$("#close_order_orig").val( '' );
$("#my_initials").val( '' );
$("#sign_orig").val( '' );
$("#invoice_date").html( '' );
$("#payment_date").html( '' );
$("#b_account_id").val( '' );
-// $("#amount").html( '' );
-// $("#approved_amount").html( '' );
$("#currency").html( '' );
$("#oppsynsmannid").html( '' );
$("#saksbehandlerid").html( '' );
@@ -239,9 +77,6 @@
}
}
});
-
-
- // document.getElementById('image_content').src = '';
});
$("#approve_line").live("click", function(e){
@@ -262,6 +97,12 @@
return;
}
+ if($("#periodization").val() && !
$("#periodization_start").val())
+ {
+ alert('Du må velge startperiode');
+ return;
+ }
+
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
var requestUrl = $(thisForm).attr("action");
@@ -327,8 +168,8 @@
}
$("#receipt").html(htmlString);
-
update_form_values(line_id,
voucher_id_orig);
+ update_voucher_filter();
}
}
});
@@ -336,6 +177,50 @@
});
+
+function update_voucher_filter(){
+ var janitor_lid = $("#janitor_lid").val();
+ var supervisor_lid = $("#supervisor_lid").val();
+ var budget_responsible_lid = $("#budget_responsible_lid").val();
+ var query = $("#query").val();
+
+ var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
+ success: function(data) {
+ if( data != null)
+ {
+ if(data.sessionExpired)
+ {
+ alert('Sesjonen er utløpt - du må logge
inn på nytt');
+ return;
+ }
+
+ htmlString = "<option>" + data.length + "
bilag funnet</option>"
+ var obj = data;
+
+ $.each(obj, function(i) {
+ htmlString += "<option value='" +
obj[i].id + "'>" + obj[i].name + "</option>";
+ });
+
+ $("#voucher_id_filter").html( htmlString );
+ }
+ else
+ {
+ htmlString += "<option>Ingen bilag</option>"
+ $("#voucher_id_filter").html( htmlString );
+ }
+ }
+ });
+}
+
+
function update_form_values( line_id, voucher_id_orig ){
var oArgs = {menuaction:'property.uiinvoice2.get_single_line'};
var requestUrl = phpGWLink('index.php', oArgs, true);
@@ -412,7 +297,15 @@
$("#b_account_id").val( voucher[0].b_account_id
);
$("#dim_a").val( voucher[0].dim_a );
$("#currency").html( voucher[0].currency );
- $("#process_log").html(
data['generic'].process_log );
+
+ if(data['generic'].process_log != null)
+ {
+ $("#process_log").html(
data['generic'].process_log );
+ }
+ else
+ {
+ $("#process_log").html( '' );
+ }
$("#my_initials").val(
data['generic'].my_initials );
$("#sign_orig").val( data['generic'].sign_orig
);
$("#line_text").val( voucher[0].line_text );
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9375] Merge 9367:9374 from trunk,
Sigurd Nes <=