[Fmsystem-commits] [9246] property: invoice

[Sigurd Nes]

Revision: 9246
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9246
Author:   sigurdne
Date:     2012-04-30 08:06:07 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
property: invoice

Modified Paths:
--------------
    trunk/property/inc/class.sogeneric.inc.php
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php  2012-04-30 07:24:42 UTC (rev 
9245)
+++ trunk/property/inc/class.sogeneric.inc.php  2012-04-30 08:06:07 UTC (rev 
9246)
@@ -1114,7 +1114,7 @@
                                                'name'                          
=> lang('dimb role'),
                                                'acl_app'                       
=> 'property',
                                                'acl_location'          => 
'.admin',
-                                               'menu_selection'        => 
'admin::property::unit'
+                                               'menu_selection'        => 
'admin::property::accounting::dimb_role'
                                        );
                                break;
                                //-------- ID type varchar
@@ -1561,7 +1561,7 @@
                                                'name'                          
=> lang('dimb role'),
                                                'acl_app'                       
=> 'property',
                                                'acl_location'          => 
'.admin',
-                                               'menu_selection'        => 
'admin::property::accounting::dimb_role',
+                                               'menu_selection'        => 
'admin::property::accounting::dimb_role_user',
                                                'default'                       
=> array
                                                        (
                                                                'created_by'    
=> array('add'  => '$this->account'),

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2012-04-30 07:24:42 UTC (rev 
9245)
+++ trunk/property/inc/class.soinvoice.inc.php  2012-04-30 08:06:07 UTC (rev 
9246)
@@ -2142,7 +2142,7 @@
                        ." FROM fm_ecobilag"
                        ." {$this->join} fm_vendor ON fm_vendor.id = 
fm_ecobilag.spvend_code"
                        ." {$this->join} fm_ecoart ON fm_ecoart.id = 
fm_ecobilag.artid"
-                       ." $filtermethod $querymethod";
+                       ." $filtermethod $querymethod ORDER BY bilagsnr";
 
                        $lang_voucer = lang('voucher id');
                        $lang_vendor = lang('vendor');

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2012-04-30 07:24:42 UTC (rev 9245)
+++ trunk/property/setup/phpgw_no.lang  2012-04-30 08:06:07 UTC (rev 9246)
@@ -519,6 +519,7 @@
 dim b  property        no      Kostnadssted
 dimb   property        no      Kostnadssted
 dimb roles     property        no      Roller kostnadssted
+dimb role user property        no      Bruker/Rolle/Kostnadssted
 no authorities demands property        no      Ingen myndighetskrav
 no dimb        property        no      K Ikke valgt
 dim d  property        no      Dim D