[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100929095036-ncu5js3idn7n4g5z

addons/l10n_lu/wizard/print_vat.py

@@ -10,7 +10,7 @@ import tools
 from tools.translate import _
 from report.render import render
 from report.interface import report_int
-
+import addons
 class external_pdf(render):
 
     def __init__(self, pdf):
@@ -46,7 +46,7 @@ class report_custom(report_int):
             result['info_address'] = partner.address[0].street
             result['info_address2'] = (partner.address[0].zip or '') + ' ' + (partner.address[0].city or '')
         try:
-            tools.pdf_utils.fill_pdf(tools.config['addons_path']+'/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
+            tools.pdf_utils.fill_pdf(addons.get_module_resource('l10n_lu','wizard', '2008_DECL_F_M10.pdf'), '/tmp/output.pdf', result)
             self.obj = external_pdf(file('/tmp/output.pdf').read())
             self.obj.render()
             return (self.obj.pdf, 'pdf')
@@ -75,4 +75,4 @@ class vat_declaration_report(osv.osv_memory):
 
 vat_declaration_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/project/project_view.xml

@@ -107,11 +107,12 @@
                    <group col='15' colspan='4'>
                        <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
-                       <field name="user_id" string="Project Manager" default="1"/>
+                       <field name="user_id" string="Project Manager" default="1">
+                            <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manage" icon="terp-personal"/>
+                       </field> 
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />