=== modified file 'account_payment/account_payment.py'
--- account_payment/account_payment.py	2011-02-01 11:04:30 +0000
+++ account_payment/account_payment.py	2011-03-02 19:58:32 +0000
@@ -94,6 +94,8 @@
             ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
         'date_created': fields.date('Creation date', readonly=True),
         'date_done': fields.date('Execution date', readonly=True),
+	'company_id':fields.many2one('res.company', 'Company', required=True),
+
     }
 
     _defaults = {
@@ -102,6 +104,7 @@
         'date_prefered': 'due',
         'date_created': lambda *a: time.strftime('%Y-%m-%d'),
         'reference': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'payment.order'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
     }
 
     def set_to_draft(self, cr, uid, ids, *args):

=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml	2011-02-01 10:38:53 +0000
+++ account_payment/account_payment_view.xml	2011-03-02 19:33:44 +0000
@@ -104,6 +104,7 @@
                       <field name="reference"/>
                       <field name="mode" widget='selection'/>
                       <field name="user_id"/>
+                      <field name="company_id"/>
                       <field name="date_prefered"/>
                       <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
                       <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
@@ -179,6 +180,7 @@
                     <field name="reference"/>
                     <field name="mode"/>
                     <field name="user_id"/>
+                    <field name="company_id"/>
                     <field name="date_created"/>
                     <field name="date_done"/>
                     <field name="total"/>