merge

bzr revid: fp@tinyerp.com-20100407070419-4cly41c0bvrkd00v

bin/addons/base/__terp__.py

@@ -34,7 +34,8 @@
         'security/base_security.xml',
         'res/res_security.xml',
         'res/res_config.xml',
-        'maintenance/maintenance_security.xml'
+        'maintenance/maintenance_security.xml',
+        'data/res.country.state.csv'
     ],
     'update_xml': [
         'base_update.xml',

bin/addons/base/data/res.country.state.csv

@@ -0,0 +1,52 @@
+"country_id:id","name","code"
+us,"Alabama","AL"
+us,"Alaska","AK"
+us,"Arizona","AZ"
+us,"Arkansas","AR"
+us,"California","CA"
+us,"Colorado","CO"
+us,"Connecticut","CT"
+us,"Delaware","DE"
+us,"District of Columbia","DC"
+us,"Florida","FL"
+us,"Georgia","GA"
+us,"Hawaii","HI"
+us,"Idaho","ID"
+us,"Illinois","IL"
+us,"Indiana","IN"
+us,"Iowa","IA"
+us,"Kansas","KS"
+us,"Kentucky","KY"
+us,"Louisiana","LA"
+us,"Maine","ME"
+us,"Montana","MT"
+us,"Nebraska","NE"
+us,"Nevada","NV"
+us,"New Hampshire","NH"
+us,"New Jersey","NJ"
+us,"New Mexico","NM"
+us,"New York","NY"
+us,"North Carolina","NC"
+us,"North Dakota","ND"
+us,"Ohio","OH"
+us,"Oklahoma","OK"
+us,"Oregon","OR"
+us,"Maryland","MD"
+us,"Massachusetts","MA"
+us,"Michigan","MI"
+us,"Minnesota","MN"
+us,"Mississippi","MS"
+us,"Missouri","MO"
+us,"Pennsylvania","PA"
+us,"Rhode Island","RI"
+us,"South Carolina","SC"
+us,"South Dakota","SD"
+us,"Tennessee","TN"
+us,"Texas","TX"
+us,"Utah","UT"
+us,"Vermont","VT"
+us,"Virginia","VA"
+us,"Washington","WA"
+us,"West Virginia","WV"
+us,"Wisconsin","WI"
+us,"Wyoming","WY"

bin/addons/base/module/module_view.xml

@@ -50,10 +50,12 @@
                         <filter icon="terp-sale" string="Uninstalled" domain="[('state', 'in', ['uninstalled', 'uninstallable'])]"/>
                         <filter icon="terp-sale" string="To be upgraded" domain="[('state','in', ['to upgrade', 'to remove', 'to install'])]"/>
                         <separator orientation="vertical"/>
-                       <field name="name" select="1"/>
-                       <field name="state" readonly="1" select="1"/>
+                        <filter icon="terp-sale" string="Certified" domain="[('certificate','&lt;&gt;', False)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="state" readonly="1" select="1"/>
 
-					</group>
+                    </group>
 
                </search>
             </field>

bin/addons/base/res/partner/partner.py

@@ -136,7 +136,7 @@ class res_partner(osv.osv):
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Code', size=64),
         'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
-        'user_id': fields.many2one('res.users', 'Dedicated Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
+        'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
         'website': fields.char('Website',size=64),

bin/addons/base/res/partner/partner_view.xml

@@ -329,7 +329,6 @@
                             <field colspan="4" name="events" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Notes">
-                            <separator string="Description" colspan="4"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                     </notebook>
@@ -344,7 +343,7 @@
             <field name="arch" type="xml">
                 <search string="Search Partner">
                    <group col='10' colspan='4'>
-                        <filter string="My Partners" icon="terp-partner" domain="[('parent_id','!=',False)]"/>
+                        <filter string="My Partners" icon="terp-partner" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
                         <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"

bin/osv/orm.py

@@ -1119,7 +1119,6 @@ class orm_template(object):
             for r in res.keys():
                 if r not in fields:
                     del res[r]
-        print 'Result from fields get', res
         return res
 
     #
@@ -2903,7 +2902,6 @@ class orm(orm_template):
         :raise UserError: if the record is default property for other records
 
         """
-                
         if not ids:
             return True
         if isinstance(ids, (int, long)):
@@ -2935,7 +2933,7 @@ class orm(orm_template):
         self.check_access_rule(cr, uid, ids, 'unlink', context=context)
         for sub_ids in cr.split_for_in_conditions(ids):
             cr.execute('delete from ' + self._table + ' ' \
-                       'where id in %s', sub_ids)
+                       'where id in ('+','.join(['%s'] * len(sub_ids))+')', sub_ids)
 
         for order, object, store_ids, fields in result_store:
             if object != self._name: