← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

Atul Patel(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/47771

1) Removed "attrs" in invoice task work field for bug-708660.


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/47771
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp.
=== modified file 'document_ftp/test/document_ftp_test4.yml'
--- document_ftp/test/document_ftp_test4.yml	2011-01-14 00:11:01 +0000
+++ document_ftp/test/document_ftp_test4.yml	2011-01-28 07:31:25 +0000
@@ -129,20 +129,6 @@
             # That's what should happen
             pass
 -
-    I try to create a folder directly under the Partners Testing folder
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        import ftplib
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
-        try:
-            ftp.mkd('Weird folder')
-            assert False, "We should't be able to create folders here"
-        except ftplib.error_perm:
-            # That's what should happen
-            pass
--
     I check that all/Partner1 also has the file
 - |
     Bonus Piste:

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2011-01-14 00:11:01 +0000
+++ project_timesheet/project_timesheet_view.xml	2011-01-28 07:31:25 +0000
@@ -11,7 +11,7 @@
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Invoicing Data"/>
                         <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
-                        <field name="to_invoice" widget="selection" string="Invoice Task Work" attrs="{'required':[('partner_id','!=',False)]}"/>
+                        <field name="to_invoice" widget="selection" string="Invoice Task Work"/>
                         <field name="amount_max" groups="base.group_extended"/>
                         <field name="amount_invoiced" groups="base.group_extended"/>
                     </group>


Follow ups