[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: atp@tinyerp.co.in-20100527122257-wpqejsedp0aww07s

addons/account/wizard/account_invoice_refund.py

@@ -18,10 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import time
+
 from osv import fields, osv
 from tools.translate import _
 import netsvc
-import time
 
 class account_invoice_refund(osv.osv_memory):
 
@@ -30,16 +31,15 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation date', required=False, help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
-       'period': fields.many2one('account.period', 'Force period', required=False),
-       'description': fields.char('Description', size=150, required=True),
+       'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
+       'period': fields.many2one('account.period', 'Force period'),
+       'description': fields.char('Description', size=128, required=True),
     }
-    
     _defaults = {
         'date': time.strftime('%Y-%m-%d'),
-    }
+                }
 
-    def compute_refund(self, cr, uid, ids, mode, context=None):
+    def compute_refund(self, cr, uid, ids, mode='refund', context=None):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -78,21 +78,20 @@ class account_invoice_refund(osv.osv_memory):
                             result_query = cr.fetchone()
                             if result_query:
                                 cr.execute("""SELECT id
-                                          from account_period where date('%s')
+                                          from account_period where date(%s)
                                           between date_start AND  date_stop \
                                           and company_id = %s limit 1 """,
-                                          (form['date'], self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
+                                          (date, self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
                             else:
                                 cr.execute("""SELECT id
-                                        from account_period where date('%s')
+                                        from account_period where date(%s)
                                         between date_start AND  date_stop  \
-                                        limit 1 """, (form['date'],))
+                                        limit 1 """, (date,))
                             res = cr.fetchone()
                             if res:
                                 period = res[0]
                 else:
                     date = inv.date_invoice
-
                 if form['description'] :
                     description = form['description']
                 else:
@@ -129,7 +128,7 @@ class account_invoice_refund(osv.osv_memory):
                                         writeoff_journal_id=inv.journal_id.id,
                                         writeoff_acc_id=inv.account_id.id
                                         )
-                    if mode == 'modify' :
+                    if mode == 'modify':
                         invoice = inv_obj.read(cr, uid, [inv.id],
                                     ['name', 'type', 'number', 'reference',
                                     'comment', 'date_due', 'partner_id',

addons/board_account/i18n/pl.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account

addons/hr/hr_view.xml

@@ -199,6 +199,7 @@
                     <field name="ssnid"/>
                     <field name="user_id"/>
                     <field name="address_id"/>
+
                 </tree>
             </field>
         </record>

addons/hr_contract/hr_contract_view.xml

@@ -147,9 +147,7 @@
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-
                         <filter string="Wage Type" icon="terp-project" domain="[]" context="{'group_by':'wage_type_id'}"/>
-
                     </group>
                </search>
             </field>
@@ -204,7 +202,6 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="working_hours"/>
-                    <field name="type_id"/>
                     <field name="wage_type_id"/>
                     <field name="wage"/>
                 </tree>