[MERGE]

bzr revid: uco@tinyerp.com-20100520062523-rjcrygjo17g2pmte

addons/account/account.py

@@ -231,9 +231,9 @@ class account_account(osv.osv):
             aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
             wheres = [""]
-            if query:
+            if query.strip():
                 wheres.append(query.strip())
-            if aml_query:
+            if aml_query.strip():
                 wheres.append(aml_query.strip())
             query = " AND ".join(wheres)
 
@@ -251,6 +251,7 @@ class account_account(osv.osv):
 
 
         # consolidate accounts with direct children
+        ids2.reverse()
         brs = list(self.browse(cr, uid, ids2, context=context))
         sums = {}
         while brs:
@@ -270,8 +271,9 @@ class account_account(osv.osv):
                     if current.child_id:
                         sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
         res = {}
+        null_result = dict((fn, 0.0) for fn in field_names)
         for id in ids:
-            res[id] = sums[id]
+            res[id] = sums.get(id, null_result)
         return res
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}):
@@ -313,7 +315,7 @@ class account_account(osv.osv):
         'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
             help="These types are defined according to your country. The type contains more information "\
             "about the account and its specificities."),
-        'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade'),
+        'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
         'child_id': fields.function(_get_child_ids, method=True, type='many2many', relation="account.account", string="Child Accounts"),
@@ -450,18 +452,42 @@ class account_account(osv.osv):
     def _check_moves(self, cr, uid, ids, method, context):
         line_obj = self.pool.get('account.move.line')
         account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
+        
         if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
             if method == 'write':
                 raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
             elif method == 'unlink':
                 raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
+        #Checking whether the account is set as a property to any Partner or not
+        value = 'account.account,' + str(ids[0])
+        partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
+        if partner_prop_acc:
+            raise osv.except_osv(_('Warning !'), _('You cannot remove/deactivate an account which is set as a property to any Partner.'))
+        return True
+
+    def _check_allow_type_change(self, cr, uid, ids, new_type, context):
+        group1 = ['payable', 'receivable', 'other']
+        group2 = ['consolidation','view']
+        line_obj = self.pool.get('account.move.line')
+        for account in self.browse(cr, uid, ids, context=context):
+            old_type = account.type
+            account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])])
+            if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
+                #Check for 'Closed' type
+                if old_type == 'closed' and new_type !='closed':
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains account entries!"))
+                #Check for change From group1 to group2 and vice versa
+                if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains account entries!") % (old_type,new_type,))
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
-        if not context:
+        if context is None:
             context = {}
         if 'active' in vals and not vals['active']:
             self._check_moves(cr, uid, ids, "write", context)
+        if 'type' in vals.keys(): 
+            self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, context={}):
@@ -557,15 +583,16 @@ class account_journal(osv.osv):
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
-            args=[]
-        if not context:
-            context={}
+            args = []
+        if context is None:
+            context = {}
         ids = []
         if name:
-            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit, context=context)
         if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
+
 account_journal()
 
 class account_fiscalyear(osv.osv):
@@ -631,6 +658,19 @@ class account_fiscalyear(osv.osv):
             else:
                 return False
         return ids[0]
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+        if not ids:
+            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
+    
 account_fiscalyear()
 
 class account_period(osv.osv):
@@ -706,12 +746,24 @@ class account_period(osv.osv):
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
         return True
+    
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+        if not ids:
+            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
 
 account_period()
 
 class account_journal_period(osv.osv):
     _name = "account.journal.period"
-    _description = "Journal - Period"
+    _description = "Journal Period"
 
     def _icon_get(self, cr, uid, ids, field_name, arg=None, context={}):
         result = {}.fromkeys(ids, 'STOCK_NEW')
@@ -950,7 +1002,6 @@ class account_move(osv.osv):
                         l[2]['period_id'] = default_period
                 context['period_id'] = default_period
 
-        accnt_journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'])
         if 'line_id' in vals:
             c = context.copy()
             c['novalidate'] = True
@@ -1248,7 +1299,7 @@ class account_tax_code(osv.osv):
     _description = 'Tax Code'
     _rec_name = 'code'
     _columns = {
-        'name': fields.char('Tax Case Name', size=64, required=True),
+        'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
         'code': fields.char('Case Code', size=64),
         'info': fields.text('Description'),
         'sum': fields.function(_sum_year, method=True, string="Year Sum"),
@@ -1262,6 +1313,15 @@ class account_tax_code(osv.osv):
     }
 
 
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context)
+
+
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
@@ -1290,7 +1350,15 @@ class account_tax_code(osv.osv):
                 return False
             level -= 1
         return True
+    
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'line_ids': []})
+        return super(account_tax_code, self).copy(cr, uid, id, default, context)
+    
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
     ]

addons/account/account_analytic_line.py

@@ -30,7 +30,7 @@ from tools import config
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
-    _description = 'Analytic lines'
+    _description = 'Analytic Line'
     _columns = {
         'product_uom_id' : fields.many2one('product.uom', 'UoM'),
         'product_id' : fields.many2one('product.product', 'Product'),
@@ -42,7 +42,7 @@ class account_analytic_line(osv.osv):
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', c),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
     }
     _order = 'date'
     
@@ -118,7 +118,7 @@ account_analytic_line()
 
 class timesheet_invoice(osv.osv):
     _name = "report.hr.timesheet.invoice.journal"
-    _description = "Analytic account costs and revenues"
+    _description = "Analytic Account Costs and Revenues"
     _auto = False
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),

addons/account/account_bank_statement.py

@@ -387,7 +387,7 @@ account_bank_statement()
 
 class account_bank_statement_reconcile(osv.osv):
     _name = "account.bank.statement.reconcile"
-    _description = "Statement reconcile"
+    _description = "Statement Reconcile"
 
     def _total_entry(self, cursor, user, ids, name, attr, context=None):
         result = {}
@@ -558,35 +558,40 @@ class account_bank_statement_line(osv.osv):
 
     def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id,
             context={}):
+        res = {'value': {}}
         if not partner_id:
-            return {}
-        res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
-
-        company_currency_id = res_users_obj.browse(cursor, user, user,
-                context=context).company_id.currency_id.id
-
-        if not currency_id:
-            currency_id = company_currency_id
-
-        part = self.pool.get('res.partner').browse(cursor, user, partner_id,
+            return res
+        line = self.browse(cursor, user, line_id)
+  
+        if not line or (line and not line[0].account_id):
+            part = self.pool.get('res.partner').browse(cursor, user, partner_id,
                 context=context)
-        if type == 'supplier':
-            account_id = part.property_account_payable.id
-        else:
-            account_id =  part.property_account_receivable.id
+            if type == 'supplier':
+                account_id = part.property_account_payable.id
+            else:
+                account_id = part.property_account_receivable.id
+            res['value']['account_id'] = account_id
 
-        cursor.execute('SELECT sum(debit-credit) \
+        if not line or (line and not line[0].amount):
+            res_users_obj = self.pool.get('res.users')
+            res_currency_obj = self.pool.get('res.currency')
+            company_currency_id = res_users_obj.browse(cursor, user, user,
+                    context=context).company_id.currency_id.id
+            if not currency_id:
+                currency_id = company_currency_id
+
+            cursor.execute('SELECT sum(debit-credit) \
                 FROM account_move_line \
                 WHERE (reconcile_id is null) \
                     AND partner_id = %s \
                     AND account_id=%s', (partner_id, account_id))
-        res = cursor.fetchone()
-        balance = res and res[0] or 0.0
+            pgres = cursor.fetchone()
+            balance = pgres and pgres[0] or 0.0
 
-        balance = res_currency_obj.compute(cursor, user, company_currency_id,
+            balance = res_currency_obj.compute(cursor, user, company_currency_id,
                 currency_id, balance, context=context)
-        return {'value': {'amount': balance, 'account_id': account_id}}
+            res['value']['amount'] = balance
+        return res
 
     def _reconcile_amount(self, cursor, user, ids, name, args, context=None):
         if not ids:
@@ -633,7 +638,7 @@ class account_bank_statement_line(osv.osv):
         'note': fields.text('Notes'),
         'reconcile_amount': fields.function(_reconcile_amount,
             string='Amount reconciled', method=True, type='float'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement line."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
     }
     _defaults = {
         'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),

addons/account/account_invoice_view.xml

@@ -478,9 +478,11 @@
         <act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
-        
-        <!--  Partners inherited form -->
+		
+		<act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
+		<!--  Partners inherited form -->
+        
         <record id="view_invoice_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.invoice.info.inherit</field>
             <field name="model">res.partner</field>

addons/account/account_invoice_workflow.xml

@@ -50,7 +50,7 @@ write({'state':'open'})</field>
             <field name="wkf_id" ref="wkf"/>
             <field name="name">paid</field>
             <!--<field name="flow_stop">True</field>-->
-            <field name="action">write({'state':'paid'})</field>
+            <field name="action">confirm_paid()</field>
             <field name="kind">function</field>
             <field name="signal_send">subflow.paid</field>
         </record>

addons/account/account_move_line.py

@@ -30,7 +30,7 @@ import tools
 
 class account_move_line(osv.osv):
     _name = "account.move.line"
-    _description = "Entry lines"
+    _description = "Entry Lines"
 
     def _query_get(self, cr, uid, obj='l', context={}):
         fiscalyear_obj = self.pool.get('account.fiscalyear')
@@ -577,11 +577,12 @@ class account_move_line(osv.osv):
         merges_rec = []
         for line in self.browse(cr, uid, ids, context):
             if line.reconcile_id:
-                raise osv.except_osv(_('Already Reconciled'), _('Already Reconciled'))
+                raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id:
-                        merges.append(line2.id)
+                        if line2.id not in merges:
+                            merges.append(line2.id)
                         total += (line2.debit or 0.0) - (line2.credit or 0.0)
                 merges_rec.append(line.reconcile_partial_id.id)
             else:
@@ -774,6 +775,17 @@ class account_move_line(osv.osv):
             result['fields'] = self.fields_get(cr, uid, fields, context)
         return result
 
+    def _check_moves(self, cr, uid, context):
+        # use the first move ever created for this journal and period
+        cr.execute('select id, state, name from account_move where journal_id=%s and period_id=%s order by id limit 1', (context['journal_id'],context['period_id']))
+        res = cr.fetchone()
+        if res:
+            if res[1] != 'draft':
+                raise osv.except_osv(_('UserError'),
+                       _('The account move (%s) for centralisation ' \
+                                'has been confirmed!') % res[2])
+        return res
+
     def unlink(self, cr, uid, ids, context={}, check=True):
         self._update_check(cr, uid, ids, context)
         result = False
@@ -809,7 +821,7 @@ class account_move_line(osv.osv):
             return True
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        if not context:
+        if context is None:
             context={}
         if vals.get('account_tax_id', False):
             raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !'))
@@ -825,6 +837,24 @@ class account_move_line(osv.osv):
         if vals.get('date', False):
             todo_date = vals['date']
             del vals['date']
+            
+        for line in self.browse(cr, uid, ids,context=context):
+            ctx = context.copy()
+            if ('journal_id' not in ctx):
+                if line.move_id:
+                   ctx['journal_id'] = line.move_id.journal_id.id
+                else:
+                    ctx['journal_id'] = line.journal_id.id
+            if ('period_id' not in ctx):
+                if line.move_id:
+                    ctx['period_id'] = line.move_id.period_id.id
+                else:
+                    ctx['period_id'] = line.period_id.id  
+            #Check for centralisation  
+            journal = self.pool.get('account.journal').browse(cr, uid, ctx['journal_id'], context=ctx)
+            if journal.centralisation:
+                self._check_moves(cr, uid, context=ctx)
+
         result = super(account_move_line, self).write(cr, uid, ids, vals, context)
 
         if check:
@@ -891,14 +921,9 @@ class account_move_line(osv.osv):
         is_new_move = False
         if not move_id:
             if journal.centralisation:
-                # use the first move ever created for this journal and period
-                cr.execute('select id, state, name from account_move where journal_id=%s and period_id=%s order by id limit 1', (context['journal_id'],context['period_id']))
-                res = cr.fetchone()
+                #Check for centralisation
+                res = self._check_moves(cr, uid, context)
                 if res:
-                    if res[1] != 'draft':
-                        raise osv.except_osv(_('UserError'),
-                                _('The Ledger Posting (%s) for centralisation ' \
-                                        'has been confirmed!') % res[2])
                     vals['move_id'] = res[0]
 
             if not vals.get('move_id', False):
@@ -926,7 +951,7 @@ class account_move_line(osv.osv):
                         break
             if journal.account_control_ids and not ok:
                 for a in journal.account_control_ids:
-                    if a.id==vals['account_id']:
+                    if a.id == vals['account_id']:
                         ok = True
                         break
             if (account.currency_id) and 'amount_currency' not in vals and account.currency_id.id <> company_currency:
@@ -941,7 +966,7 @@ class account_move_line(osv.osv):
         if not ok:
             raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
 
-        if 'analytic_account_id' in vals and vals['analytic_account_id']:
+        if vals.get('analytic_account_id',False):
             if journal.analytic_journal_id:
                 vals['analytic_lines'] = [(0,0, {
                         'name': vals['name'],
@@ -961,8 +986,8 @@ class account_move_line(osv.osv):
 
         result = super(osv.osv, self).create(cr, uid, vals, context)
         # CREATE Taxes
-        if 'account_tax_id' in vals and vals['account_tax_id']:
-            tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
+        if vals.get('account_tax_id',False):
+            tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
             total = vals['debit'] - vals['credit']
             if journal.refund_journal:
                 base_code = 'ref_base_code_id'
@@ -978,7 +1003,7 @@ class account_move_line(osv.osv):
                 tax_sign = 'tax_sign'
 
             tmp_cnt = 0
-            for tax in tax_obj.compute(cr,uid,[tax_id],total,1.00):
+            for tax in tax_obj.compute(cr, uid, [tax_id], total, 1.00):
                 #create the base movement
                 if tmp_cnt == 0:
                     if tax[base_code]:
@@ -1031,7 +1056,7 @@ class account_move_line(osv.osv):
         #    if context and ('__last_update' in context):
         #        del context['__last_update']
         #    self.pool.get('account.move').write(cr, uid, [move_id], {'date':vals['date']}, context=context)
-        if check and not context.get('no_store_function'):
+        if check and ((not context.get('no_store_function')) or journal.entry_posted):
             tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
             if journal.entry_posted and tmp:
                 self.pool.get('account.move').button_validate(cr,uid, [vals['move_id']],context)

addons/account/account_view.xml

@@ -531,7 +531,10 @@
                         <field name="create_date" select="1"/>
                         <field name="type" select="1"/>
                     </group>
+                    <separator colspan="4" string="Reconcile Entries"/>
                     <field colspan="4" name="line_id" nolabel="1"/>
+                    <separator colspan="4" string="Partial Reconcile Entries"/>
+                    <field colspan="4" name="line_partial_ids" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -551,6 +554,7 @@
                     <field name="code"/>
                     <field name="sum"/>
                     <field name="sum_period"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -562,7 +566,7 @@
                 <form string="Account Tax Code">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
-                    <field name="company_id" widget="selection"  groups="base.group_multi_company"/>
+                    <field name="company_id" select="1"/>
                     <field name="notprintable"/>
                     <field name="parent_id" select="1"/>
                     <field name="sign"/>
@@ -648,9 +652,9 @@
                         </page>
                         <page groups="base.group_extended" string="Special Computation">
                             <separator colspan="4" string="Compute Code (if type=code)"/>
-                            <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/>
+                            <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
                             <separator colspan="4" string="Applicable Code (if type=code)"/>
-                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/>
+                            <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
                         </page>
                     </notebook>
                 </form>
@@ -1453,9 +1457,11 @@
 
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
 
-        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
-        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All account entries" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+		
+		<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>

addons/account/invoice.py

@@ -23,8 +23,8 @@ import time
 import decimal_precision as dp
 
 import netsvc
+
 from osv import fields, osv, orm
-import ir
 import pooler
 from tools import config
 from tools.translate import _
@@ -217,6 +217,7 @@ class account_invoice(osv.osv):
     _name = "account.invoice"
     _description = 'Invoice'
     _order = "number"
+    _log_create = True
     _columns = {
         'name': fields.char('Description', size=64, select=True,readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice."),
@@ -333,7 +334,14 @@ class account_invoice(osv.osv):
                 raise orm.except_orm(_('Configuration Error!'),
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
-                raise
+                raise orm.except_orm(_('UnknownError'), str(e))
+
+    def confirm_paid(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'paid'}, context=context)
+        for (id,name) in self.name_get(cr, uid, ids):
+            message = _('Document ') + " '" + name + "' "+ _("has been paid.")
+            self.log(cr, uid, id, message)
+        return True
 
     def unlink(self, cr, uid, ids, context=None):
         invoices = self.read(cr, uid, ids, ['state'])
@@ -350,7 +358,7 @@ class account_invoice(osv.osv):
 #       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
 #       return [{}]
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
         invoice_addr_id = False
         contact_addr_id = False
         partner_payment_term = False
@@ -415,7 +423,7 @@ class account_invoice(osv.osv):
             else:
                 result['value']['date_due'] = False
 
-        if partner_bank_id != bank_id:
+        if partner_bank != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             result['value'].update(to_update['value'])
         return result
@@ -450,7 +458,7 @@ class account_invoice(osv.osv):
     def onchange_invoice_line(self, cr, uid, ids, lines):
         return {}
 
-    def onchange_partner_bank(self, cursor, user, ids, partner_bank_id):
+    def onchange_partner_bank(self, cursor, user, ids, partner_bank):
         return {'value': {}}
 
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
@@ -650,6 +658,16 @@ class account_invoice(osv.osv):
                 self.write(cr, uid, [inv.id], res['value'])
         return True
 
+    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
+        """finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
+        Hook method to be overridden in additional modules to verify and possibly alter the
+        move lines to be created by an invoice, for special cases.
+        :param invoice_browse: browsable record of the invoice that is generating the move lines
+        :param move_lines: list of dictionaries with the account.move.lines (as for create())
+        :return: the (possibly updated) final move_lines to create for this invoice
+        """
+        return move_lines
+
     def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
         if not inv.tax_line:
             for tax in compute_taxes.values():
@@ -912,7 +930,12 @@ class account_invoice(osv.osv):
                 # will be automatically deleted too
                 account_move_obj.unlink(cr, uid, [i['move_id'][0]])
             if i['payment_ids']:
-                self.pool.get('account.move.line').write(cr, uid, i['payment_ids'], {'reconcile_partial_id': False})
+                account_move_line_obj = self.pool.get('account.move.line')
+                pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
+                for move_line in pay_ids:
+                    if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
+                        raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
+
         self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
         self._log_event(cr, uid, ids,-1.0, 'Cancel Invoice')
         return True
@@ -1147,14 +1170,14 @@ class account_invoice_line(osv.osv):
                     t = t - (p * l[2].get('quantity'))
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
-                        taxes=tax_obj.browse(cr, uid, taxes[0][2])
+                        taxes = tax_obj.browse(cr, uid, taxes[0][2])
                         for tax in tax_obj.compute(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False)):
                             t = t - tax['amount']
             return t
         return 0
 
     _name = "account.invoice.line"
-    _description = "Invoice line"
+    _description = "Invoice Line"
     _columns = {
         'name': fields.char('Description', size=256, required=True),
         'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."),
@@ -1200,8 +1223,8 @@ class account_invoice_line(osv.osv):
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
         fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
 
-        lang=part.lang
-        context.update({'lang': lang})
+        if part.lang:
+            context.update({'lang': part.lang})
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
 

addons/account/partner_view.xml

@@ -113,6 +113,7 @@
                         </form>
                         <tree string="Bank Details">
                             <field name="state"/>
+                            <field name="bank"/>
                             <field name="owner_name"/>
                             <field name="acc_number"/>
                         </tree>

addons/account/project/report/analytic_check.py

@@ -54,12 +54,12 @@ class account_analytic_analytic_check(report_sxw.rml_parse):
 
             self.cr.execute("SELECT abs(sum(amount)) AS balance \
                     FROM account_analytic_line \
-                    WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %s", (date1, date2, a['id']))
+                    WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %s", (date1, date2, a['id']))
             (ad,) = self.cr.fetchone()
             ad = ad or 0.0
             self.cr.execute("SELECT abs(sum(amount)) AS balance \
                     FROM account_analytic_line \
-                    WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %s", (date1, date2, a['id']))
+                    WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %s", (date1, date2, a['id']))
             (ac,) = self.cr.fetchone()
             ac = ac or 0.0
 

addons/account/report/overdue.rml

@@ -84,8 +84,8 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.lang) ]]</para>
@@ -177,16 +177,16 @@
             <para style="terp_default_Centre_9">[[ line['ref'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ line['date_maturity'] ]]</para>
+            <para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'],date=True) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['debit']) and formatLang(line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) ]]</para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit']) and formatLang(line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) ]]</para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d')) and ((line['debit'] - line['credit']) * (line['account_id']['type'] == 'payable' and -1 or 1))) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
@@ -205,13 +205,13 @@
           <para style="terp_default_Bold_9">Sub-Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x ,y: x + (y['credit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]] </para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]]</para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -229,7 +229,7 @@
           <para style="terp_default_Bold_9">Balance : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]]</para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -248,9 +248,9 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + ((y['debit'] - y['credit']) * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]] [[ company.currency_id.name ]].</para>
+    <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.name ]].</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>

addons/account/security/ir.model.access.csv

@@ -15,8 +15,8 @@
 "access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
 "access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
 "access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
-"access_account_tax_code","account.tax.code","model_account_tax_code",,1,0,0,0
-"access_account_tax","account.tax","model_account_tax",,1,0,0,0
+"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_account_invoice",1,0,0,0
+"access_account_tax","account.tax","model_account_tax","account.group_account_invoice",1,0,0,0
 "access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
 "access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
 "access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
@@ -93,3 +93,13 @@
 "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0
+"access_project_account_analytic_line","project.account.analytic.line","model_project_account_analytic_line","account.group_account_manager",1,1,1,1
+"access_account_move_line_reconcile_select","account.move.line.reconcile.select","model_account_move_line_reconcile_select","account.group_account_manager",1,1,1,1
+"access_account_move_line_unreconcile_select","account.move.line.unreconcile.select","model_account_move_line_unreconcile_select","account.group_account_manager",1,1,1,1
+"access_account_invoice_refund","account.invoice.refund","model_account_invoice_refund","account.group_account_manager",1,1,1,1
+"access_account_move_journal","account.move.journal","model_account_move_journal","account.group_account_manager",1,1,1,1
+"access_account_move_bank_reconcile","account.move.bank.reconcile","model_account_move_bank_reconcile","account.group_account_manager",1,1,1,1
+"access_account_subscription_generate","account.subscription.generate","model_account_subscription_generate","account.group_account_manager",1,1,1,1
+"access_account_period_close","account.period.close","model_account_period_close","account.group_account_manager",1,1,1,1
+"access_account_fiscalyear_close_state","account.fiscalyear.close.state","model_account_fiscalyear_close_state","account.group_account_manager",1,1,1,1
+"access_account_chart","account.chart","model_account_chart","account.group_account_manager",1,1,1,1

addons/account/sequence.py

@@ -42,7 +42,7 @@ class ir_sequence(osv.osv):
     _columns = {
         'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences')
     }
-    def get_id(self, cr, uid, sequence_id, test='id', context={}):        
+    def get_id(self, cr, uid, sequence_id, test='id', context={}):
         cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:

addons/account/wizard/account_invoice_refund.py

@@ -21,6 +21,7 @@
 from osv import fields, osv
 from tools.translate import _
 import netsvc
+import time
 
 class account_invoice_refund(osv.osv_memory):
 
@@ -29,10 +30,14 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation date', required=False),
+       '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),
-                }
+    }
+    
+    _defaults = {
+        'date': time.strftime('%Y-%m-%d'),
+    }
 
     def compute_refund(self, cr, uid, ids, mode, context=None):
         """
@@ -167,7 +172,7 @@ class account_invoice_refund(osv.osv_memory):
                 xml_id = 'action_invoice_tree1'
             elif inv.type == 'in_invoice':
                 xml_id = 'action_invoice_tree2'
-            elif type == 'out_refund':
+            elif inv.type == 'out_refund':
                 xml_id = 'action_invoice_tree3'
             else:
                 xml_id = 'action_invoice_tree4'

addons/account/wizard/account_reconcile.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 import time
-import datetime
 
 from osv import fields, osv
 from tools.translate import _

addons/account/wizard/account_unreconcile.py

@@ -29,11 +29,17 @@ class account_unreconcile(osv.osv_memory):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
         if context is None:
             context = {}
-        recs = obj_move_line.read(cr, uid, context['active_ids'], ['reconcile_id',])
-        recs = filter(lambda x: x['reconcile_id'], recs)
-        rec_ids = [rec['reconcile_id'][0] for rec in recs]
-        if len(rec_ids):
-            obj_move_reconcile.unlink(cr, uid, rec_ids)
+        recs = pool.get('account.move.line').read(cr, uid, data['ids'], ['reconcile_id','reconcile_partial_id'])
+        unlink_ids = []
+        full_recs = filter(lambda x: x['reconcile_id'], recs)
+        rec_ids = [rec['reconcile_id'][0] for rec in full_recs]
+        part_recs = filter(lambda x: x['reconcile_partial_id'], recs)
+        part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
+        unlink_ids += rec_ids
+        unlink_ids += part_rec_ids
+    
+        if len(unlink_ids):
+            pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, unlink_ids)
         return {}
 
 account_unreconcile()
@@ -44,10 +50,11 @@ class account_unreconcile_reconcile(osv.osv_memory):
 
     def trans_unrec_reconcile(self, cr, uid, ids, context=None):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
+        rec_ids = context['active_ids']
         if context is None:
             context = {}
         if len(rec_ids):
-            obj_move_reconcile.unlink(cr, uid, context['active_ids'])
+            obj_move_reconcile.unlink(cr, uid, rec_ids)
         return {}
 
 account_unreconcile_reconcile()

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -393,7 +393,7 @@ account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
-    _description = "Hours summary by user"
+    _description = "Hours Summary by User"
     _order='user'
     _auto = False
     _rec_name = 'user'

addons/account_analytic_default/account_analytic_default.py

@@ -25,7 +25,7 @@ import time
 
 class account_analytic_default(osv.osv):
     _name = 'account.analytic.default'
-    _description = 'Analytic Distributions'
+    _description = 'Analytic Distribution'
     _rec_name = 'analytic_id'
     _order = 'sequence'
     _columns = {
@@ -69,7 +69,7 @@ account_analytic_default()
 
 class account_invoice_line(osv.osv):
     _inherit = 'account.invoice.line'
-    _description = 'account invoice line'
+    _description = 'Invoice Line'
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
         res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, currency_id=currency_id, context=context)
@@ -103,6 +103,8 @@ class sale_order_line(osv.osv):
     # Method overridden to set the analytic account by default on criterion match
     def invoice_line_create(self, cr, uid, ids, context={}):
         create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        if not ids:
+            return create_ids
         sale_line_obj = self.browse(cr, uid, ids[0], context)
         pool_inv_line = self.pool.get('account.invoice.line')
 

addons/account_analytic_plans/account_analytic_plans.py

@@ -54,7 +54,7 @@ class one2many_mod2(fields.one2many):
 
 class account_analytic_plan(osv.osv):
     _name = "account.analytic.plan"
-    _description = "Analytic Plans"
+    _description = "Analytic Plan"
     _columns = {
         'name': fields.char('Analytic Plan', size=64, required=True, select=True,),
         'plan_ids': fields.one2many('account.analytic.plan.line','plan_id','Analytic Plans'),
@@ -63,7 +63,7 @@ account_analytic_plan()
 
 class account_analytic_plan_line(osv.osv):
     _name = "account.analytic.plan.line"
-    _description = "Analytic Plan Lines"
+    _description = "Analytic Plan Line"
     _columns = {
         'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
@@ -297,14 +297,15 @@ class account_move_line(osv.osv):
 
     def create_analytic_lines(self, cr, uid, ids, context={}):
         super(account_move_line, self).create_analytic_lines(cr, uid, ids, context)
+        analytic_line_obj = self.pool.get('account.analytic.line')
         for line in self.browse(cr, uid, ids, context):
            if line.analytics_id:
                if not line.journal_id.analytic_journal_id:
                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
 
-               toremove = self.pool.get('account.analytic.line').search(cr, uid, [('move_id','=',line.id)], context=context)
+               toremove = analytic_line_obj.search(cr, uid, [('move_id','=',line.id)], context=context)
                if toremove:
-                    line.unlink(cr, uid, toremove, context=context)
+                    analytic_line_obj.unlink(cr, uid, toremove, context=context)
                for line2 in line.analytics_id.account_ids:
                    val = (line.credit or  0.0) - (line.debit or 0.0)
                    amt=val * (line2.rate/100)
@@ -321,7 +322,7 @@ class account_move_line(osv.osv):
                        'journal_id': line.journal_id.analytic_journal_id.id,
                        'ref': line.ref,
                    }
-                   ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)
+                   ali_id=analytic_line_obj.create(cr, uid, al_vals, context=context)
         return True
 
 account_move_line()

addons/account_anglo_saxon/purchase.py

@@ -24,7 +24,7 @@ from osv import fields, osv
 class purchase_order(osv.osv):
     _name = "purchase.order"
     _inherit = "purchase.order"
-    _description = "Purchase order"
+    _description = "Purchase Order"
 
     def inv_line_create(self, cr, uid, a, ol):
         line = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
@@ -37,5 +37,4 @@ class purchase_order(osv.osv):
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
                 line[2].update({'account_id': a})
         return line
-purchase_order()        
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:        
+purchase_order()

addons/account_budget/crossovered_budget.py

@@ -239,7 +239,7 @@ class crossovered_budget_lines(osv.osv):
                 res[line.id]=0.00
         return res
     _name="crossovered.budget.lines"
-    _description = "Budget Lines"
+    _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),

addons/account_chart/i18n/th.po

@@ -0,0 +1,23 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-20 04:33+0000\n"
+"Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "ทำการลบตัวอย่างผังบัญชีแบบง่าย"

addons/account_followup/followup.py

@@ -23,7 +23,7 @@ from osv import fields, osv
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
-    _description = 'Follow-Ups'
+    _description = 'Follow-Up'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'description': fields.text('Description'),
@@ -34,7 +34,7 @@ followup()
 
 class followup_line(osv.osv):
     _name = 'account_followup.followup.line'
-    _description = 'Follow-Ups Criteria'
+    _description = 'Follow-Up Criteria'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."),

addons/account_followup/followup_report.py

@@ -30,7 +30,7 @@ def _code_get(self, cr, uid, context={}):
 
 class account_followup_stat(osv.osv):
     _name = "account_followup.stat"
-    _description = "Followup statistics"
+    _description = "Followup Statistics"
     _auto = False
     _columns = {
         'name': fields.many2one('res.partner', 'Partner', readonly=True),

addons/account_followup/followup_view.xml

@@ -124,7 +124,7 @@
             </field>
         </record>
         
-        <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True)]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
+        <act_window domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="account.act_account_partner_account_move_unreconciled" name="Receivables &amp; Payables" res_model="account.move.line" view="account_move_line_partner_tree"/>
         
         <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="All receivable entries" res_model="account.move.line" src_model="" view="account_move_line_partner_tree"/>
         

addons/account_payment/payment.py

@@ -28,7 +28,7 @@ import pooler
 
 class payment_type(osv.osv):
     _name= 'payment.type'
-    _description= 'Payment type'
+    _description= 'Payment Type'
     _columns= {
         'name': fields.char('Name', size=64, required=True,help='Payment Type'),
         'code': fields.char('Code', size=64, required=True,help='Specifies the Code for Payment Type'),
@@ -43,7 +43,7 @@ payment_type()
 
 class payment_mode(osv.osv):
     _name= 'payment.mode'
-    _description= 'Payment mode'
+    _description= 'Payment Mode'
     _columns= {
         'name': fields.char('Name', size=64, required=True,help='Mode of Payment'),
         'bank_id': fields.many2one('res.partner.bank', "Bank account",

addons/account_payment/payment_view.xml

@@ -25,6 +25,8 @@
                     <field name="partner_id"/>
                     <field name="ref"/>
                     <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="account_id"/>
                     <field name="date_maturity"/>
                     <field name="date"/>
                     <field name="debit" sum="Total debit"/>
@@ -279,7 +281,6 @@
                     <field name="currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
-                    <field domain="[('partner_id', '=', partner_id)]" name="bank_id"/>
                     <field name="create_date"/>
                     <field name="name"/>
                 </tree>

addons/account_payment/wizard/account_payment_order.py

@@ -104,7 +104,7 @@ class payment_order_create(osv.osv_memory):
 
         # Search for move line to pay:
         domain = [('reconcile_id', '=', False),('account_id.type', '=', 'payable'),('amount_to_pay', '>', 0)]
-        domain = domain + ['|',('date_maturity','<',search_due_date),('date_maturity','=',False)]
+        domain = domain + ['|',('date_maturity','<=',search_due_date),('date_maturity','=',False)]
         line_ids = line_obj.search(cr, uid, domain, context=context)
         context.update({'line_ids': line_ids})
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_create_payment_order_lines')], context=context)

addons/account_payment/wizard/account_payment_populate_statement.py

@@ -106,5 +106,3 @@ class account_payment_populate_statement(osv.osv_memory):
         return {'type' : 'ir.actions.act_window_close'}
 
 account_payment_populate_statement()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_report/account.py

@@ -32,7 +32,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class account_report(osv.osv):
     _name = "account.report.report"
-    _description = "Account reporting"
+    _description = "Account Reporting"
 #    _color = [
 #            ('', ''),
 #            ('green','Green'),

addons/account_reporting/account.py

@@ -30,7 +30,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class color_rml(osv.osv):
     _name = "color.rml"
-    _description = "Rml Colors"
+    _description = "Rml Color"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'code': fields.char('code',size=64,required=True),

addons/account_voucher/voucher.py

@@ -103,7 +103,7 @@ class account_voucher(osv.osv):
             ],'Type', readonly=True, select=True , size=128),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
         'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=False, states={'proforma':[('readonly',True)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}, required=True),
@@ -167,15 +167,14 @@ class account_voucher(osv.osv):
             return {'value':{'account_id':account_id.id}}
 
     def open_voucher(self, cr, uid, ids, context={}):
-        obj=self.pool.get('account.voucher').browse(cr,uid,ids)
-        total=0
+        obj = self.pool.get('account.voucher').browse(cr,uid,ids)
+        total = 0
         for i in obj[0].payment_ids:
-            total+=i.amount
-        if total!=0:
-            self.write(cr,uid,ids,{'amount':total})
-            self.write(cr, uid, ids, {'state':'proforma'})
+            total += i.amount
+        if total != 0:
+            self.write(cr, uid, ids, {'amount':total, 'state':'proforma'})
         else:
-            raise osv.except_osv('Invalid action !', 'You can not post to Pro-Forma a voucher with Total amount = 0')
+            raise osv.except_osv('Invalid action !', 'You cannot post to Pro-Forma a voucher with Total amount = 0 !')
         return True
 
     def proforma_voucher(self, cr, uid, ids, context={}):
@@ -302,9 +301,9 @@ class account_voucher(osv.osv):
                 name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
 
             move = {
-                'name': name,
+                'name' : name,
                 'journal_id': journal_id,
-                'voucher_type':inv.type,
+                'type' : inv.type,
                 'narration' : inv.narration
             }
             if inv.period_id:
@@ -487,7 +486,7 @@ class account_voucher_line(osv.osv):
     _columns = {
         'voucher_id':fields.many2one('account.voucher', 'Voucher'),
         'name':fields.char('Description', size=256, required=True),
-        'account_id':fields.many2one('account.account','Account', required=True),
+        'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True),
         'amount':fields.float('Amount'),
         'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'),

addons/analytic/project.py

@@ -31,7 +31,7 @@ import decimal_precision as dp
 
 class account_analytic_account(osv.osv):
     _name = 'account.analytic.account'
-    _description = 'Analytic Accounts'
+    _description = 'Analytic Account'
 
     def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, acc_set, context={}):
         # Handle multi-currency on each level of analytic account
@@ -285,7 +285,7 @@ account_analytic_account()
 
 class account_analytic_line(osv.osv):
     _name = 'account.analytic.line'
-    _description = 'Analytic lines'
+    _description = 'Analytic Line'
     def _amount_currency(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
         for rec in self.browse(cr, uid, ids, context):
@@ -343,7 +343,7 @@ class account_analytic_line(osv.osv):
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', c),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
     }
     _order = 'date'
 account_analytic_line()

addons/analytic_user_function/analytic_user_function.py

@@ -100,7 +100,7 @@ class hr_analytic_timesheet(osv.osv):
                                 'for this product: "%s" (id:%d)') % \
                                 (r.product_id.name, r.product_id.id,))
             # Compute based on pricetype
-            amount_unit=self.on_change_unit_amount(cr, uid, ids, 
+            amount_unit = self.on_change_unit_amount(cr, uid, ids, 
                 r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
                 
             amount = unit_amount *  amount_unit
@@ -136,7 +136,7 @@ class hr_analytic_timesheet(osv.osv):
                                     'for this product: "%s" (id:%d)') % \
                                     (r.product_id.name, r.product_id.id,))
                 # Compute based on pricetype
-                amount_unit=self.on_change_unit_amount(cr, uid, ids, 
+                amount_unit = self.on_change_unit_amount(cr, uid, ids, 
                     r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
                         
                 amount = unit_amount * amount_unit

addons/auction/security/ir.model.access.csv

@@ -32,3 +32,5 @@
 "acess_auction_payer","auction.payer","model_auction_payer","base.group_user",1,0,0,0
 "access_auction_pay_sel","auction.pay.sel","model_auction_payer_sel","base.group_user",1,0,0,0
 "acess_auction_taken","auction.taken","model_auction_taken","base.group_user",1,0,0,0
+"access_auction_catalog_flagey","auction.catalog.flagey","model_auction_catalog_flagey","base.group_user",1,0,0,0
+"access_auction_lots_buyer_map_user","auction_lots_buyer_map_user","model_auction_lots_buyer_map","base.group_user",1,0,0,0

addons/base_contact/base_contact.py

@@ -19,14 +19,13 @@
 #
 ##############################################################################
 
-import netsvc
 from osv import fields, osv
 
 class res_partner_contact(osv.osv):
     """ Partner Contact """
 
     _name = "res.partner.contact"
-    _description = "res.partner.contact"
+    _description = "Contact"
 
     def _title_get(self,cr, user, context={}):
         """
@@ -116,22 +115,6 @@ res_partner_contact()
 
 class res_partner_address(osv.osv):
 
-    def search(self, cr, user, args, offset=0, limit=None, order=None,
-            context=None, count=False):
-        """ search parnter address
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user
-            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-            @param offset: The Number of Results to Pass
-            @param limit: The Number of Results to Return
-            @param context: A standard dictionary for contextual values
-        """
-
-        if context and context.has_key('address_partner_id' ) and context['address_partner_id']:
-            args.append(('partner_id', '=', context['address_partner_id']))
-        return super(res_partner_address, self).search(cr, user, args, offset, limit, order, context, count)
-
     #overriding of the name_get defined in base in order to remove the old contact name
     def name_get(self, cr, user, ids, context={}):
         """
@@ -208,6 +191,8 @@ class res_partner_job(osv.osv):
                 if arg[2] and not count:
                     search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
                     contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, limit=limit, order=order, context=context, count=count)
+                    if not contact_ids:
+                         continue
                     contacts = contact_obj.browse(cr, user, contact_ids, context=context)
                     for contact in contacts:
                         job_ids.extend([item.id for item in contact.job_ids])
@@ -224,10 +209,10 @@ class res_partner_job(osv.osv):
     _order = 'sequence_contact'
 
     _columns = {
-        'name': fields.related('address_id','partner_id', type='many2one',\
+        'name': fields.related('address_id', 'partner_id', type='many2one',\
                      relation='res.partner', string='Partner', help="You may\
                      enter Address first,Partner will be linked automatically if any."),
-        'address_id': fields.many2one('res.partner.address','Address', \
+        'address_id': fields.many2one('res.partner.address', 'Address', domain=[('partner_id', '=', name)], \
                         help='Address which is linked to the Partner'),
         'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
         'function_id': fields.many2one('res.partner.function','Partner Function', \
@@ -251,7 +236,34 @@ class res_partner_job(osv.osv):
         'sequence_contact' : lambda *a: 0,
         'state': lambda *a: 'current',
     }
+    
+    def onchange_partner(self, cr, uid, _, partner_id, context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user,
+            @param _: List of IDs,
+            @partner_id : ID of the Partner selected,
+            @param context: A standard dictionary for contextual values
+        """
+        return {'value': {'address_id': False}}
 
+    def onchange_address(self, cr, uid, _, address_id, context=None):
+        """
+            @@param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user,
+            @param _: List of IDs,
+            @address_id : ID of the Address selected,
+            @param context: A standard dictionary for contextual values
+        """
+        partner_id = False
+        if address_id:
+            address = self.pool.get('res.partner.address')\
+                        .browse(cr, uid, address_id, context)
+            partner_id = address.partner_id.id
+        return {'value': {'name': partner_id}}
+    
 res_partner_job()
 
 

addons/base_contact/base_contact_view.xml

@@ -52,7 +52,7 @@
                             <form string="Functions and Addresses">
                                <group string="Partner" colspan="2" col="4">
                                    <field name="function_id"/>
-                                   <field name="address_id" context="{'address_partner_id': name}"/>
+                                   <field name="address_id"/>
                                    <field name="name"/>
                                    <field name="date_start" />
                                    <field name="date_stop" />
@@ -357,23 +357,19 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Contact Functions">
-                <notebook>
-                    <page string="General">
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1" context="{'address_partner_id': name}"/>
-                        <field name="contact_id" select="1"/>
-                        <field name="function_id" select="1"/>
-                        <field name="email" widget="email"/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="extension"/>
-                        <field name="sequence_contact" groups="base.group_user"/>
-                        <field name="sequence_partner" groups="base.group_user"/>
-                        <field name="date_start" groups="base.group_user"/>
-                        <field name="date_stop" groups="base.group_user"/>
-                        <field name="state" />
-                    </page>
-                </notebook>
+	             <field name="name" select="1" on_change="onchange_partner(name)"/>
+	             <field name="address_id" select="1" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
+	             <field name="contact_id" select="1"/>
+	             <field name="function_id" select="1"/>
+	             <field name="email" widget="email"/>
+	             <field name="phone"/>
+	             <field name="fax"/>
+	             <field name="extension"/>
+	             <field name="sequence_contact" groups="base.group_user"/>
+	             <field name="sequence_partner" groups="base.group_user"/>
+	             <field name="date_start" groups="base.group_user"/>
+	             <field name="date_stop" groups="base.group_user"/>
+	             <field name="state" />
             </form>
         </field>
     </record>

addons/base_iban/base_iban_view.xml

@@ -42,6 +42,17 @@
                 </field>
             </field>
         </record>
+        <record id="view_partner_iban_list" model="ir.ui.view">
+            <field name="name">res.partner.form.iban.inherit.list</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                	<field name="iban"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>

addons/base_module_quality/speed_test/speed_test.py

@@ -19,12 +19,28 @@
 #
 ##############################################################################
 
-from osv import fields, osv
 from tools.translate import _
 import pooler
 
 from base_module_quality import base_module_quality
 
+class CounterCursor(object):
+    def __init__(self, real_cursor):
+        self.cr = real_cursor
+        self.count = 0
+
+    def reset(self):
+        self.count = 0
+
+    def execute(self, query, params=None):
+        if query.lower().startswith('select '):
+            self.count += 1
+        return self.cr.execute(query, params)
+
+    def __getattr__(self, attr):
+        return getattr(self.cr, attr)
+
+
 class quality_test(base_module_quality.abstract_quality_check):
 
     def __init__(self):
@@ -63,6 +79,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need
         result_dict = {}
         result_dict2 = {}
         self.result_details += _("<html>O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is hardly wished.\n</html>")
+        ccr = CounterCursor(cr)
         for obj, ids in obj_ids.items():
             code_base_complexity = 0
             code_half_complexity = 0
@@ -73,22 +90,22 @@ This test checks the speed of the module. Note that at least 5 demo data is need
             list2 = []
             if size:
                 speed_list = []
-                #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries)
                 try:
-                    pool.get(obj).read(cr, uid, [ids[0]])
-                    cnt = cr.count
-                    pool.get(obj).read(cr, uid, [ids[0]])
-                    code_base_complexity = cr.count - cnt
-
-                    pool.get(obj).read(cr, uid, ids[:size/2])
-                    cnt = cr.count
-                    pool.get(obj).read(cr, uid, ids[:size/2])
-                    code_half_complexity = cr.count - cnt
-
+                    # perform the operation once to put data in cache
                     pool.get(obj).read(cr, uid, ids)
-                    cnt = cr.count
-                    pool.get(obj).read(cr, uid, ids)
-                    code_size_complexity = cr.count - cnt
+
+                    ccr.reset()
+                    pool.get(obj).read(ccr, uid, [ids[0]])
+                    code_base_complexity = ccr.count
+
+                    ccr.reset()
+                    pool.get(obj).read(ccr, uid, ids[:size/2])
+                    code_half_complexity = ccr.count
+
+                    ccr.reset()
+                    pool.get(obj).read(ccr, uid, ids)
+                    code_size_complexity = ccr.count
+
                 except Exception, e:
                     list2 = [obj, _("Error in Read method")]
                     speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method:" + str(e))]

addons/base_report_creator/base_report_creator.py

@@ -35,7 +35,7 @@ class report_creator(osv.osv):
     #
     def export_data(self, cr, uid, ids, fields_to_export, context=None):
         
-        if not context:
+        if context is None:
             context = {}
         data_l = self.read(cr, uid, ids, ['sql_query'], context)
         final_datas = []
@@ -61,7 +61,7 @@ class report_creator(osv.osv):
         @param Fields: List of field of customer reports form.
         @return: Dictionary of Fields
         """
-        if not context:
+        if context is None:
             context = {}
             
         data = context and context.get('report_id', False) or False
@@ -95,7 +95,7 @@ class report_creator(osv.osv):
         @param user: the current user’s ID for security checks,
         @return: Dictionary of Fields, arch and toolbar.
         """
-        if not context:
+        if context is None:
             context = {}
           
         data = context and context.get('report_id', False) or False    
@@ -116,9 +116,11 @@ class report_creator(osv.osv):
             
         arch = '<?xml version="1.0" encoding="utf-8"?>\n'
         if view_type == 'graph':
-            arch  += '<graph string="%s" type="%s" orientation="%s">' % (report.name, report.view_graph_type, report.view_graph_orientation)
+            orientation_eval = {'horz':'horizontal','vert' :'vertical'}
+            orientation = eval(report.view_graph_orientation,orientation_eval)
+            arch +='<graph string="%s" type="%s" orientation="%s">' % (report.name, report.view_graph_type, orientation)
+            i = 0
             for val in ('x','y'):
-                i = 0
                 for f in report.field_ids:
                     if f.graph_mode == val:
                         if f.field_id.model:
@@ -191,7 +193,9 @@ class report_creator(osv.osv):
         @param fields: List of fields.
         @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
         """
-        data = context and context.get('report_id', False) or False
+        if context is None:
+            context = {}
+        data = context.get('report_id', False)
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).read(cr, user, ids, fields, context, load)
         ctx = context or {}
@@ -225,8 +229,9 @@ class report_creator(osv.osv):
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
         @return: List of id 
         """
-
-        context_id = context and context.get('report_id', False) or False
+        if context is None:
+            context = {}
+        context_id = context.get('report_id', False)
         
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count)
@@ -372,9 +377,10 @@ class report_creator(osv.osv):
                 t = self.pool.get(f.field_id.model_id.model)._table
                 if f.group_method == 'group':
                     fields.append('\t'+t+'.'+f.field_id.name+' as field'+str(i))
+                    groupby.append(t+'.'+f.field_id.name)
                 else:
                     fields.append('\t'+f.group_method+'('+t+'.'+f.field_id.name+')'+' as field'+str(i))
-                groupby.append(t+'.'+f.field_id.name)
+                    
                 i += 1
             models = self._path_get(cr, uid, obj.model_ids, obj.filter_ids)
             check = self._id_get(cr, uid, ids[0], context)

addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py

@@ -309,27 +309,32 @@ class PyOpenOffice(object):
         return new_c
 
 def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
-    import libxslt
-    import libxml2
+    from lxml import etree
+    from StringIO import StringIO
+
     tool = PyOpenOffice(output, save_pict = save_pict)
     res = tool.unpackNormalize(sxw_file)
-    styledoc = libxml2.parseDoc(xsl)
-    style = libxslt.parseStylesheetDoc(styledoc)
-    doc = libxml2.parseMemory(res,len(res))
-    result = style.applyStylesheet(doc, None)
-
-    root = result.xpathEval("/document/stylesheet")
+    
+    f = StringIO(xsl)
+    styledoc = etree.parse(f)
+    style = etree.XSLT(styledoc)
+    
+    f = StringIO(res)
+    doc = etree.parse(f)
+    result = style(doc)
+    root = etree.XPathEvaluator(result)("/document/stylesheet")
+    
     if root:
         root=root[0]
-        images = libxml2.newNode("images")
+        images = etree.Element("images")
         for img in tool.images:
-            node = libxml2.newNode('image')
-            node.setProp('name', img)
-            node.setContent( base64.encodestring(tool.images[img]))
-            images.addChild(node)
-        root.addNextSibling(images)
+            node = etree.Element('image', name=img)
+            node.text = base64.encodestring(tool.images[img])
+            images.append(node)
+        root.append(images)
+
     try:
-        xml = style.saveResultToString(result)
+        xml = str(result)
         return xml
     except:
         return result
@@ -349,7 +354,7 @@ if __name__ == "__main__":
     import StringIO
 
     fname = sys.argv[1]
-    f = StringIO.StringIO(file(fname).read())
+    f = fname
     xsl_file = 'normalized_oo2rml.xsl'
     z = zipfile.ZipFile(fname,"r")
     mimetype = z.read('mimetype')

addons/base_setup/gtk_contact_form.py

@@ -74,21 +74,26 @@ class base_gtkcontactform(osv.osv_memory):
              'contact_me':fields.boolean('Contact Me'),
              }
     def execute(self, cr, uid, ids, context=None):
-        company_id = self.pool.get('base.setup.company').search(cr, uid, [])
-        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id)
-        company_data = company_data and company_data[0] or False
+        if context is None:
+            context = {}
+
+        company_id = self.pool.get('base.setup.company').search(cr, uid, [], context=context)
+        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
+        company_data = company_data and company_data[0] or {}
         country = ''
-        if company_data and company_data.get('country_id', False):
-            country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'])['name']
-        for res in self.read(cr, uid, ids):
+        
+        if company_data.get('country_id', False):
+            country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
+        
+        for res in self.read(cr, uid, ids, context=context):
             email = res.get('email','')
-            result = "\ncompany: "+ str(company_data.get('name',''))
-            result += "\nname: " + str(res.get('name',''))
-            result += "\njob: " + str(res.get('job',''))
+            result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
+            result += "\nname: " + tools.ustr(res.get('name',''))
+            result += "\njob: " + tools.ustr(res.get('job',''))
             result += "\nphone: " + str(res.get('phone',''))
-            result += "\ncity: " + str(company_data.get('city',''))
+            result += "\ncity: " + tools.ustr(company_data.get('city',''))
             result += "\ncountry: " + str(country)
-            result += "\nindustry: " + str(res.get('industry', ''))
+            result += "\nindustry: " + tools.ustr(res.get('industry', ''))
             result += "\ntotal_employees: " + str(res.get('total_employees', ''))
             result += "\nplan_use: " +  str(res.get('use_openerp', False))
             result += "\nalready_using_openerp: " + str(res.get('already_using_openerp', False))

addons/base_setup/i18n/th.po

@@ -0,0 +1,277 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-20 04:32+0000\n"
+"Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,city:0
+#: wizard_field:base_setup.base_setup,init,city:0
+#: wizard_field:base_setup.base_setup,update,city:0
+msgid "City"
+msgstr "อำเภอ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid ""
+"You can start configuring the system or connect directly to the database "
+"using the default setup."
+msgstr "คุณอาจจะเริ่มตั้งค่าหรือใช้ค่าพื้นฐานเบื้องต้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,zip:0
+#: wizard_field:base_setup.base_setup,init,zip:0
+#: wizard_field:base_setup.base_setup,update,zip:0
+msgid "Zip code"
+msgstr "รหัสไปรษณีย์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid "Select a Profile"
+msgstr "เลือกแบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,config:0
+msgid "Start Configuration"
+msgstr "เริ่มการตั้งค่า"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"You'll be able to install more modules later through the Administration menu."
+msgstr "คุณสามารถลงโมดูลใหม่ๆได้ในเมนูการบริหารระบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"A profile sets a pre-selection of modules for specific needs. These profiles "
+"have been setup to help you discover the different aspects of OpenERP. This "
+"is just an overview, we have 300+ available modules."
+msgstr ""
+"รูปแบบโมดูลเป็นเพียงการตั้งค่าแนะนำในการใช้งานเพื่อตั้งค่าได้ง่ายขึ้น "
+"แต่เรามีโมดูลที่สามารถหาติดตั้งได้มากกว่า 500 โมดูล"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,update:0
+#: wizard_button:base_setup.base_setup,init,company:0
+msgid "Next"
+msgstr "ถัดไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,email:0
+#: wizard_field:base_setup.base_setup,init,email:0
+#: wizard_field:base_setup.base_setup,update,email:0
+msgid "E-mail"
+msgstr "อีเมล์"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,state_id:0
+#: wizard_field:base_setup.base_setup,init,state_id:0
+#: wizard_field:base_setup.base_setup,update,state_id:0
+msgid "State"
+msgstr "จังหวัด"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Your new database is now fully installed."
+msgstr "ฐานข้อมูลใหม่ตั้งตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,profile:0
+#: wizard_field:base_setup.base_setup,init,profile:0
+#: wizard_field:base_setup.base_setup,update,profile:0
+msgid "Profile"
+msgstr "รูปแบบ"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer1:0
+#: wizard_field:base_setup.base_setup,init,rml_footer1:0
+#: wizard_field:base_setup.base_setup,update,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "หัวรายงาน 1"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer2:0
+#: wizard_field:base_setup.base_setup,init,rml_footer2:0
+#: wizard_field:base_setup.base_setup,update,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "ท้ายรายงาน 2"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "General Information"
+msgstr "ข้อมูลทั่วไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street2:0
+#: wizard_field:base_setup.base_setup,init,street2:0
+#: wizard_field:base_setup.base_setup,update,street2:0
+msgid "Street2"
+msgstr "ตำบล"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report Information"
+msgstr "ข้อมูลรายงาน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,phone:0
+#: wizard_field:base_setup.base_setup,init,phone:0
+#: wizard_field:base_setup.base_setup,update,phone:0
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Define Main Company"
+msgstr "ตั้งบริษัทหลัก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,name:0
+#: wizard_field:base_setup.base_setup,init,name:0
+#: wizard_field:base_setup.base_setup,update,name:0
+msgid "Company Name"
+msgstr "ชื่อบริษัท"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer2:0
+#: help:base_setup.base_setup,init,rml_footer2:0
+#: help:base_setup.base_setup,update,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้เปลี่ยนโดยใส่ข้อมูลของธนาคาร\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,country_id:0
+#: wizard_field:base_setup.base_setup,init,country_id:0
+#: wizard_field:base_setup.base_setup,update,country_id:0
+msgid "Country"
+msgstr "ประเทศ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+#: wizard_view:base_setup.base_setup,finish:0
+#: wizard_view:base_setup.base_setup,init:0
+#: wizard_view:base_setup.base_setup,update:0
+#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
+#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
+msgid "Setup"
+msgstr "ตั้งค่า"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer1:0
+#: help:base_setup.base_setup,init,rml_footer1:0
+#: help:base_setup.base_setup,update,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้ท่านนำข้อมูลเกี่ยวกับทางกฏหมาย\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,update:0
+msgid "Summary"
+msgstr "สรุป"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,update,finish:0
+msgid "Install"
+msgstr "ติดตั้ง"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Installation Done"
+msgstr "ติดตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_header1:0
+#: help:base_setup.base_setup,init,rml_header1:0
+#: help:base_setup.base_setup,update,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+"ข้อมูลนี่จะอยู่ในด้านบนขวาของรายงานท่าน\n"
+"กรุณาใส่ สโลแกน\n"
+"\"Open Source Business Solutions\"."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_header1:0
+#: wizard_field:base_setup.base_setup,init,rml_header1:0
+#: wizard_field:base_setup.base_setup,update,rml_header1:0
+msgid "Report Header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr "กรุณาใช้โลโก้ขนาด 450X150 px"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,currency:0
+#: wizard_field:base_setup.base_setup,init,currency:0
+#: wizard_field:base_setup.base_setup,update,currency:0
+msgid "Currency"
+msgstr "อัตราแลกเปลี่ยน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street:0
+#: wizard_field:base_setup.base_setup,init,street:0
+#: wizard_field:base_setup.base_setup,update,street:0
+msgid "Street"
+msgstr "ที่อยู่"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,menu:0
+msgid "Use Directly"
+msgstr "ใช้ทันที"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,init,menu:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,logo:0
+#: wizard_field:base_setup.base_setup,init,logo:0
+#: wizard_field:base_setup.base_setup,update,logo:0
+msgid "Logo"
+msgstr "โลโก้"
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr "โครงสร้าง ตั้งค่า"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,init:0
+#: wizard_button:base_setup.base_setup,update,company:0
+msgid "Previous"
+msgstr "ก่อนหน้า"

addons/base_setup/todo.py

@@ -152,5 +152,23 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
                     context=context)
 base_setup_company()
 
+class res_currency(osv.osv):
+    _inherit = 'res.currency'
+    
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+#        We can use the following line,if we want to restrict this name_get for company setup only
+#        But, its better to show currencies as name(Code).
+#        if not (context.get('active_model','') == 'ir.actions.todo'):
+#            return super(res_currency,self).name_get(cr, uid, ids, context=context)
+        if not len(ids):
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
+        return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['code']) + ')')   for x in reads]
+        
+res_currency()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/board_association/i18n/lt.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:20+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-19 09:15+0000\n"
+"Last-Translator: Rytis Ūsalis <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
@@ -40,7 +40,7 @@ msgstr ""
 #. module: board_association
 #: view:board.board:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mano užduotys"
 
 #. module: board_association
 #: view:board.board:0

addons/crm/crm_lead.py

@@ -32,7 +32,7 @@ class crm_lead(osv.osv, crm_case):
     """ CRM Lead Case """
 
     _name = "crm.lead"
-    _description = "Leads Cases"
+    _description = "Lead"
     _order = "priority, id desc"
     _inherit = ['res.partner.address', 'mailgate.thread']
 

addons/crm/crm_lead_menu.xml

@@ -10,6 +10,7 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="context">{"search_default_user_id":uid,'search_default_current':1}</field>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
+        <field name="context">{'search_default_current':1}</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">

addons/crm/crm_lead_view.xml

@@ -47,7 +47,7 @@
                          name="convert_opportunity"
                          string="Convert"
                          help="Convert to Opportunity"
-                         icon="gtk-index"
+                         icon="gtk-index"   
                          type="object"
                          attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
@@ -103,18 +103,18 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state"/>
-                        <button name="case_close" string="Close"
-                            states="open,draft,pending" type="object"
-                            icon="gtk-close" />
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
+                        <button name="case_close" string="Close"
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_pending" string="Pending"
                             states="draft,open" type="object"
                             icon="gtk-media-pause" />
+                        <button name="case_cancel" string="Cancel"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
                             groups="base.group_extended"
@@ -126,7 +126,7 @@
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
-                        <separator string="Categories" colspan="2" col="2"/>
+                        <separator string="Categorization" colspan="2" col="2"/>
                         <field name="company_id"
                             groups="base.group_multi_company"
                             widget="selection" colspan="2" />
@@ -198,7 +198,8 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads Tree"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+            <tree string="Leads Tree"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
+                <field name="date_deadline" invisible="1"/>
                 <field name="create_date"/>
                 <field name="partner_name"/>
                 <field name="name"/>
@@ -299,7 +300,7 @@
                     <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id','=',uid)]"
-                        help="My section"/>
+                        help="My Sale Team"/>
                     <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[]"
@@ -310,7 +311,6 @@
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <filter string="Type" icon="terp-crm" domain="[]" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Team" icon="terp-crm" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>

addons/crm/crm_meeting.py

@@ -41,7 +41,7 @@ class crm_meeting(osv.osv, crm_case):
     """ CRM Meeting Cases """
 
     _name = 'crm.meeting'
-    _description = "Meeting Cases"
+    _description = "Meeting"
     _order = "id desc"
     _inherit = ["mailgate.thread", "calendar.event"]
 

addons/crm/crm_meeting_menu.xml

@@ -50,7 +50,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{'search_default_current':1,"search_default_user_id":uid}</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
 

addons/crm/crm_meeting_view.xml

@@ -267,14 +267,14 @@
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
-                           <filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section" />
-                       	   </field>
+                               <filter icon="terp-crm"
+                                   domain="[('section_id','=',context.get('section_id',False))]"
+                                   help="My Sale Team" />
+                           </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                        <newline/>
-						<group expand="0" string="Group By..." colspan="16">
+					   	<group expand="0" string="Group By..." colspan="16">
 							<filter string="Date" icon="terp-project"
 						        domain="[]" context="{'group_by':'date'}" />
 						    <filter string="Privacy" icon="terp-crm"

addons/crm/crm_opportunity.py

@@ -36,12 +36,10 @@ AVAILABLE_STATES = [
 
 class crm_opportunity(osv.osv):
     """ Opportunity Cases """
-
     _name = "crm.lead"
-    _description = "Opportunity Cases"
+    _description = "Opportunity"
     _order = "priority,date_action,id desc"
     _inherit = 'crm.lead'
-
     _columns = {
         # From crm.case
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
@@ -56,7 +54,6 @@ class crm_opportunity(osv.osv):
         'date_deadline': fields.date('Expected Closing'),
         'date_action': fields.date('Next Action'),
          }
-    
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting probability and close date
         @param self: The object pointer

addons/crm/crm_opportunity_view.xml

@@ -115,57 +115,25 @@
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
+                        <button name="case_pending" string="Pending"
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
                             groups="base.group_extended"
                             icon="gtk-go-up" />
-                        <button name="case_pending" string="Pending"
-                            states="draft,open" type="object"
-                            icon="gtk-media-pause" />
+                        <button name="case_cancel" string="Mark Lost"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_close" string="Mark Won"
                             states="open,draft,pending" type="object"
                             icon="gtk-apply" />
-                        <button name="case_cancel" string="Mark Lost"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
                         <button name="case_reset" string="Reset to New"
                             states="done,cancel" type="object"
                             icon="gtk-convert" />
                     </group>
                 </page>
 
-                <page string="History" groups="base.group_extended">
-                    <group col="2" colspan="2">
-                        <separator string="Dates" colspan="2"/>
-                        <field name="create_date"/>
-                        <field name="write_date"/>
-                        <field name="date_closed"/>
-                        <field name="date_open"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator string="Misc" colspan="2"/>
-                        <field name="active"/>
-                        <field name="day_open"/>
-                        <field name="day_close"/>
-                        <field name="referred"/>
-                    </group>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                    	 <tree string="Logs">
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </tree>
-                        <form string="Logs">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </form>
-                    </field>
-                </page>
                  <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
@@ -199,6 +167,38 @@
                                name="%(crm_lead_forward_to_partner_act)d"
                                icon="gtk-go-forward" type="action" />
                  </page>
+                <page string="History" groups="base.group_extended">
+                    <group col="2" colspan="2">
+                        <separator string="Dates" colspan="2"/>
+                        <field name="create_date"/>
+                        <field name="write_date"/>
+                        <field name="date_closed"/>
+                        <field name="date_open"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Misc" colspan="2"/>
+                        <field name="active"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
+                        <field name="referred"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <field name="ref"/>
+                    <field name="ref2"/>
+                    <field name="log_ids" nolabel="1" colspan="4">
+                    	 <tree string="Logs">
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </tree>
+                        <form string="Logs">
+                            <separator string="Action Information" colspan="4"/>
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </form>
+                    </field>
+                </page>
                 </notebook>
             </form>
         </field>
@@ -211,7 +211,8 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel','done')">
+            <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline &lt; current_date">
+                <field name="date_deadline" invisible="1"/>
                 <field name="create_date"/>
                 <field name="name" string="Opportunity"/>
                 <field name="partner_id"/>
@@ -234,7 +235,7 @@
                     icon="gtk-go-forward" />
                 <button name="case_close" string="Won"
                     states="open,draft,pending" type="object"
-                    icon="gtk-close" />
+                    icon="gtk-apply" />
                 <button name="case_pending" string="Pending"
                     states="open,draft" type="object"
                     icon="gtk-media-pause" />
@@ -297,10 +298,10 @@
                 <field name="section_id"
                     default="context.get('section_id', False)" select="1"
                     widget="selection">
-	                <filter icon="terp-crm"
-	                        domain="[('section_id','=',context.get('section_id',False))]"
-	                        help="My section" />
-	                </field>
+                    <filter icon="terp-crm"
+                        domain="[('section_id','=',context.get('section_id',False))]"
+                        help="My Sale Team" />
+                </field>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Stage" icon="terp-crm" domain="[]"

addons/crm/crm_phonecall.py

@@ -29,7 +29,7 @@ class crm_phonecall(osv.osv, crm_case):
     """ Phonecall Cases """
 
     _name = "crm.phonecall"
-    _description = "Phonecall Cases"
+    _description = "Phonecall"
     _order = "id desc"
     _inherit = 'mailgate.thread'
 

addons/crm/crm_phonecall_view.xml

@@ -269,10 +269,10 @@
                </field>
                <field name="section_id"
                    select="1" widget="selection" string="Sales Team">
-					<filter icon="terp-crm"
-                        domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My section" />
-                </field>
+                   <filter icon="terp-crm"
+                       domain="[('section_id','=',context.get('section_id',False))]"
+                       help="My Sale Team" />
+               </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"

addons/crm/crm_view.xml

@@ -18,7 +18,6 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
-                        <newline/>
                         <field name="resource_calendar_id" select="2"/>
                     </group>
                     <notebook colspan="4">
@@ -39,8 +38,8 @@
                             </group>
                             <separator string="Members List" colspan="4"/>
                             <field name="member_ids" nolabel="1" colspan="4"/>
-                            <separator string="Note" colspan="4"/>
-                            <field name="note" select="1" colspan="4" nolabel="1"/>
+                        </page><page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>

addons/delivery/delivery.py

@@ -26,7 +26,7 @@ from tools.translate import _
 
 class delivery_carrier(osv.osv):
     _name = "delivery.carrier"
-    _description = "Carrier and delivery grids"
+    _description = "Carrier"
 
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
@@ -144,7 +144,7 @@ delivery_grid()
 
 class delivery_grid_line(osv.osv):
     _name = "delivery.grid.line"
-    _description = "Delivery line of grid"
+    _description = "Delivery Grid Line"
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),

addons/delivery/delivery_view.xml

@@ -128,7 +128,7 @@
             <field name="arch" type="xml">
                 <group name="logistic" position="inside">
                     <field name="id" invisible="True"/>
-                    <field name="carrier_id" context="{'order_id':id}"/>
+                    <field name="carrier_id" context="{'order_id':active_id}"/>
                 </group>
             </field>
         </record>

addons/delivery/security/ir.model.access.csv

@@ -7,3 +7,5 @@
 "access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","sale.group_sale_manager",1,1,1,1
 "access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
 "access_delivery_carrier_stock_worker","delivery.carrier stock_worker","model_delivery_carrier","stock.group_stock_user",1,0,0,0
+"access_delivery_sale_order_manager","delivery.sale.order","model_delivery_sale_order","sale.group_sale_manager",1,1,1,1
+"access_delivery_sale_order","delivery.sale.order","model_delivery_sale_order","sale.group_sale_user",1,0,0,0

addons/delivery/stock.py

@@ -29,7 +29,7 @@ import decimal_precision as dp
 # Overloaded stock_picking to manage carriers :
 class stock_picking(osv.osv):
     _name = "stock.picking"
-    _description = "Picking list"
+    _description = "Packing List"
     _inherit = 'stock.picking'
 
     def _cal_weight(self, cr, uid, ids, name, args, context=None):
@@ -55,7 +55,7 @@ class stock_picking(osv.osv):
         'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'),
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
-                 'stock.move': (_get_picking_line, ['product_id','product_uos_qty'], 20),
+                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
         }
 

addons/document/document_directory.py

@@ -31,7 +31,7 @@ from tools.translate import _
 
 class document_directory(osv.osv):
     _name = 'document.directory'
-    _description = 'Document directory'
+    _description = 'Directory'
     _order = 'name desc'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
@@ -286,7 +286,7 @@ class document_directory_dctx(osv.osv):
         appended to all children down the tree.
     """
     _name = 'document.directory.dctx'
-    _description = 'Directory dynamic context'
+    _description = 'Directory Dynamic Context'
     _columns = {
         'dir_id': fields.many2one('document.directory', 'Directory', required=True),
         'field': fields.char('Field', size=20, required=True, select=1, help="The name of the field. Note that the prefix \"dctx_\" will be prepended to what is typed here."),

addons/document/document_storage.py

@@ -95,7 +95,7 @@ class document_storage(osv.osv):
     the same tree of filesystem storage.
     """
     _name = 'document.storage'
-    _description = 'Document storage media'
+    _description = 'Storage Media'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),

addons/document_ftp/doc_conf_wizard.py

@@ -30,7 +30,7 @@ import os
 class document_configuration_wizard(osv.osv_memory):
 
     _name='document.configuration.wizard'
-    _description = 'Auto Directory configuration'
+    _description = 'Auto Directory Configuration'
     _inherit = 'res.config'
     _rec_name = 'host'
     _columns = {

addons/document_ftp/ftpserver/abstracted_fs.py

@@ -123,7 +123,7 @@ class abstracted_fs:
     def db_list(self):
         #return pooler.pool_dic.keys()
         s = netsvc.ExportService.getService('db')
-        result = s.exp_list()
+        result = s.exp_list(document=True)
         self.db_name_list = []
         for db_name in result:
             db, cr = None, None

addons/document_ics/document_ics.py

@@ -177,7 +177,6 @@ class document_directory_content(osv.osv):
             fexprs[n.name] = n.expr
 
         if 'uid' not in fields:
-            print "uid not in ", fields
             # FIXME: should pass
             return True
         for child in parsedCal.getChildren():
@@ -189,7 +188,6 @@ class document_directory_content(osv.osv):
                 if enl =='uid':
                     uuid = event.value
                 if not enl in fields:
-                        # print "skip", enl
                         continue
                 if fields[enl] and funcs[enl] == 'field':
                     if ICS_TAGS[enl]=='normal':
@@ -216,7 +214,6 @@ class document_directory_content(osv.osv):
             # end for
 
             if not uuid:
-                print "Skipping cal", child
                 # FIXME: should pass
                 continue
 

addons/event/event.py

@@ -218,11 +218,13 @@ class event_registration(osv.osv):
             args[1]['description']= event.mail_confirm
         return super(event_registration, self).write(cr, uid, *args, **argv)
 
-    def mail_user_confirm(self,cr,uid,ids):
-        reg_ids=self.browse(cr,uid,ids)
+    def mail_user_confirm(self, cr, uid, ids):
+        reg_ids = self.browse(cr,uid,ids)
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
-            dest = [reg_id.email_from]
+            dest = []
+            if reg_id.email_from:
+                dest += [reg_id.email_from]
             if reg_id.email_cc:
                 dest += [reg_id.email_cc]
             if dest and src:
@@ -231,11 +233,13 @@ class event_registration(osv.osv):
                 raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
         return False
 
-    def mail_user(self,cr,uid,ids):
-        reg_ids=self.browse(cr,uid,ids)
+    def mail_user(self, cr, uid, ids):
+        reg_ids = self.browse(cr, uid, ids)
         for reg_id in reg_ids:
             src = reg_id.event_id.reply_to or False
-            dest = [reg_id.email_from]
+            dest = []
+            if reg_id.email_from:
+                dest += [reg_id.email_from]
             if reg_id.email_cc:
                 dest += [reg_id.email_cc]
             if reg_id.event_id.mail_auto_confirm or reg_id.event_id.mail_auto_registr:

addons/event/security/ir.model.access.csv

@@ -5,3 +5,8 @@
 "access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1
 "access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0
 "access_report_event_type_registration","report.event.type.registration","model_report_event_type_registration","crm.group_crm_user",1,0,0,0
+"access_event_confirm_registration","event.confirm.registration","model_event_confirm_registration","crm.group_crm_user",1,0,0,0
+"access_event_confirm_registration_manager","event.confirm.registration manager","model_event_confirm_registration","crm.group_crm_manager",1,1,1,1
+"access_event_make_invoice","event.make.invoice","model_event_make_invoice","crm.group_crm_user",1,1,1,1
+"access_event_partners_list","event.partners.list","model_event_partners_list","crm.group_crm_user",1,0,0,0
+"access_event_registration_list","event.registration.list","model_event_registration_list","crm.group_crm_user",1,0,0,0

addons/event/wizard/event_make_invoice.py

@@ -68,8 +68,11 @@ class event_make_invoice(osv.osv_memory):
                 inv_reject = inv_reject + 1
                 inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
                 continue
-            partner_address_list = reg.partner_invoice_id and self.pool.get('res.partner').address_get(cr, uid, [reg.partner_invoice_id.id], adr_pref=['invoice'])
-            partner_address_id = partner_address_list['invoice']
+            else:
+                val_invoice = pool_obj.get('account.invoice').onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
+                val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
+                partner_address_id = val_invoice['value']['address_invoice_id']
+                
             if not partner_address_id:
                 inv_reject = inv_reject + 1
                 inv_rej_reason += "ID "+str(reg.id)+": Registered partner doesn't have an address to make the invoice. \n"
@@ -82,8 +85,9 @@ class event_make_invoice(osv.osv_memory):
                 tax_ids.append(tax.id)
 
             vals = value['value']
+            c_name = reg.contact_id and ('-' + self.pool.get('res.partner.contact').name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
             vals.update({
-                'name': reg.name,
+                'name': reg.invoice_label + '-' + c_name,
                 'price_unit': reg.unit_price,
                 'quantity': reg.nb_register,
                 'product_id':reg.event_id.product_id.id,
@@ -91,23 +95,14 @@ class event_make_invoice(osv.osv_memory):
             })
             inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
 
-            inv = {
-                'name': reg.invoice_label,
+            val_invoice['value'].update({
                 'origin': reg.invoice_label,
-                'type': 'out_invoice',
                 'reference': False,
-                'account_id': reg.partner_invoice_id.property_account_receivable.id,
-                'partner_id': reg.partner_invoice_id.id,
-                'address_invoice_id':partner_address_id,
-                'address_contact_id':partner_address_id,
                 'invoice_line': [(6,0,[inv_line_ids])],
-                'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
                 'comment': "",
-                'payment_term':reg.partner_invoice_id.property_payment_term.id,
-                'fiscal_position': reg.partner_invoice_id.property_account_position.id
-            }
+            })
 
-            inv_id = inv_obj.create(cr, uid, inv)
+            inv_id = inv_obj.create(cr, uid, val_invoice['value'])
             list_inv.append(inv_id)
             obj_event_reg.write(cr, uid, reg.id, {'invoice_id': inv_id, 'state': 'done'})
             obj_event_reg._history(cr, uid, [reg.id], 'Invoiced', history=True)

addons/fetchmail/__openerp__.py

@@ -38,7 +38,8 @@
     'init_xml': [],
     'update_xml': [
         "fetchmail_view.xml",
-        "fetchmail_data.xml"
+        "fetchmail_data.xml",
+        'security/ir.model.access.csv',
     ],
     'demo_xml': [
 

addons/fetchmail/security/ir.model.access.csv

@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_email_server","email.server","model_email_server",,1,1,1,1
+"access_mail_server_history","mail.server.history","model_mail_server_history",,1,1,1,1
+"access_email_server_tools","email.server.tools","model_email_server_tools",,1,1,1,1

addons/hr/hr_department.py

@@ -101,7 +101,7 @@ ir_action_window()
 
 class res_users(osv.osv):
     _inherit = 'res.users'
-    _description = 'res.users'
+    _description = 'User'
 
     def _parent_compute(self, cr, uid, ids, name, args, context={}):
         result = {}

addons/hr_attendance/hr_attendance.py

@@ -27,7 +27,7 @@ from tools.translate import _
 
 class hr_action_reason(osv.osv):
     _name = "hr.action.reason"
-    _description = "Action reason"
+    _description = "Action Reason"
     _columns = {
         'name' : fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
         'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),

addons/hr_contract/hr_contract_view.xml

@@ -153,7 +153,7 @@
                </search>
             </field>
         </record>
-
+        
         <record id="hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
             <field name="model">hr.contract</field>

addons/hr_evaluation/security/ir.model.access.csv

@@ -8,3 +8,5 @@
 "access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,0,0,0
 "access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_manager",1,1,1,1
 "access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report",,1,0,0,0
+"access_hr_evaluation_reminder_manager","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_reminder","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_user",1,0,0,0

addons/hr_expense/hr_expense.py

@@ -50,7 +50,7 @@ class hr_expense_expense(osv.osv):
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
 
     _name = "hr.expense.expense"
-    _description = "HR Expense"
+    _description = "Expense"
     _columns = {
         'name': fields.char('Expense Sheet', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),

addons/hr_expense/security/ir.model.access.csv

@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","hr.group_hr_user",1,1,1,1
 "access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1
+"access_hr_expense_report","hr.expense.report","model_hr_expense_report","hr.group_hr_user",1,0,0,0

addons/hr_holidays/hr_holidays.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 import time
-
+import datetime
 import pooler
 import netsvc
 from osv import fields, osv
@@ -29,7 +29,7 @@ from tools.translate import _
 
 class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
-    _description = "Leave Types"
+    _description = "Leave Type"
 
     def get_days_cat(self, cr, uid, ids, category_id, return_false, context={}):
         res = {}
@@ -106,7 +106,7 @@ hr_holidays_status()
 
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
-    _description = "Holidays"
+    _description = "Leave"
     _order = "type desc, date_from asc"
 
     def _employee_get(obj, cr, uid, context=None):
@@ -182,14 +182,14 @@ class hr_holidays(osv.osv):
                                     }
         return result
 
-    def _get_number_of_days(date_from, date_to):
+    def _get_number_of_days(self, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
 
         DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
         from_dt = datetime.datetime.strptime(date_from, DATETIME_FORMAT)
         to_dt = datetime.datetime.strptime(date_to, DATETIME_FORMAT)
         timedelta = to_dt - from_dt
-        diff_day = timedelta.days + float(timedelata.seconds) / 86400
+        diff_day = timedelta.days + float(timedelta.seconds) / 86400
         return diff_day
 
     def _update_user_holidays(self, cr, uid, ids):
@@ -204,14 +204,16 @@ class hr_holidays(osv.osv):
                     self.unlink(cr, uid, list_ids)
 
     def _check_date(self, cr, uid, ids):
-        if ids:
-            cr.execute('select number_of_days_temp from hr_holidays where id in ('+','.join(map(str, ids))+')')
-            res =  cr.fetchall()
-            if res and res[0][0] and res[0][0] < 0:
+        for rec in self.read(cr, uid, ids, ['number_of_days_temp','date_from','date_to']):
+            if rec['number_of_days_temp'] < 0:
+                return False
+            date_from = time.strptime(rec['date_from'], '%Y-%m-%d %H:%M:%S')
+            date_to = time.strptime(rec['date_to'], '%Y-%m-%d %H:%M:%S')
+            if date_from > date_to:
                 return False
         return True
 
-    _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])]
+    _constraints = [(_check_date, 'Start date should not be larger than end date!\nNumber of Days should be greater than 1!', ['number_of_days_temp'])]
 
     def unlink(self, cr, uid, ids, context={}):
         leave_obj = self.pool.get('resource.calendar.leaves')
@@ -235,7 +237,7 @@ class hr_holidays(osv.osv):
         return result
 
     def onchange_date_to(self, cr, uid, ids, date_from, date_to):
-        return onchange_date_from(cr, uid, ids, date_to, date_from)
+        return self.onchange_date_from(cr, uid, ids, date_to, date_from)
 
     def onchange_sec_id(self, cr, uid, ids, status, context={}):
         warning = {}
@@ -430,7 +432,7 @@ class resource_calendar_leaves(osv.osv):
     _description = "Leave Detail"
     _columns = {
         'holiday_id': fields.many2one("hr.holidays", "Holiday"),
-                }
+    }
 
 resource_calendar_leaves()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr_recruitment/hr_recruitment.py

@@ -55,7 +55,7 @@ hr_recruitment_stage()
 
 class hr_applicant(osv.osv, crm.crm_case):
     _name = "hr.applicant"
-    _description = "Applicant Cases"
+    _description = "Applicant"
     _order = "id desc"
     _inherit ='mailgate.thread'
 

addons/hr_recruitment/security/ir.model.access.csv

@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_manager",1,1,1,1
+"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report",,1,0,0,0

addons/hr_timesheet/hr_timesheet.py

@@ -39,7 +39,7 @@ hr_employee()
 class hr_analytic_timesheet(osv.osv):
     _name = "hr.analytic.timesheet"
     _table = 'hr_analytic_timesheet'
-    _description = "Timesheet line"
+    _description = "Timesheet Line"
     _inherits = {'account.analytic.line': 'line_id'}
     _order = "id desc"
     _columns = {
@@ -60,7 +60,7 @@ class hr_analytic_timesheet(osv.osv):
 #        if prod_id and unit_amount:
         if prod_id:
             # find company
-            company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context)
+            company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
             res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,company_id,unit, context)
         return res
 

addons/hr_timesheet_invoice/hr_timesheet_invoice.py

@@ -25,7 +25,7 @@ from tools.translate import _
 
 class hr_timesheet_invoice_factor(osv.osv):
     _name = "hr_timesheet_invoice.factor"
-    _description = "Invoice rate"
+    _description = "Invoice Rate"
     _columns = {
         'name': fields.char('Internal name', size=128, required=True),
         'customer_name': fields.char('Name', size=128),

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

@@ -364,7 +364,7 @@ class hr_timesheet_line(osv.osv):
                 res[line_id] = False
         return res
 
-    def _sheet_search(self, cursor, user, obj, name, args, context):
+    def _sheet_search(self, cursor, user, obj, name, args, context=None):
         if not len(args):
             return []
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -482,7 +482,7 @@ class hr_attendance(osv.osv):
                 res[line_id] = False
         return res
 
-    def _sheet_search(self, cursor, user, obj, name, args, context={}):
+    def _sheet_search(self, cursor, user, obj, name, args, context=None):
         if not len(args):
             return []
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -581,7 +581,7 @@ hr_attendance()
 
 class hr_timesheet_sheet_sheet_day(osv.osv):
     _name = "hr_timesheet_sheet.sheet.day"
-    _description = "Timesheets by period"
+    _description = "Timesheets by Period"
     _auto = False
     _order='name'
     _columns = {
@@ -662,7 +662,7 @@ hr_timesheet_sheet_sheet_day()
 
 class hr_timesheet_sheet_sheet_account(osv.osv):
     _name = "hr_timesheet_sheet.sheet.account"
-    _description = "Timesheets by period"
+    _description = "Timesheets by Period"
     _auto = False
     _order='name'
     _columns = {

addons/html_view/security/ir.model.access.csv

@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_html_view","html.view","model_html_view",,1,0,0,0

addons/idea/idea.py

@@ -31,7 +31,7 @@ class idea_category(osv.osv):
     """ Category of Idea """
 
     _name = "idea.category"
-    _description = "Category for an idea"
+    _description = "Idea Category"
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
@@ -251,7 +251,7 @@ class idea_comment(osv.osv):
     """ Apply Idea for Comment """
 
     _name = 'idea.comment'
-    _description = 'Comments'
+    _description = 'Comment'
     _rec_name = 'content'
 
     _columns = {
@@ -274,7 +274,7 @@ class idea_vote(osv.osv):
     """ Apply Idea for Vote """
 
     _name = 'idea.vote'
-    _description = 'Vote for Idea'
+    _description = 'Idea Vote'
     _rec_name = 'score'
 
     _columns = {

addons/l10n_be/account_pcmn_belgium.xml

@@ -7029,8 +7029,8 @@
             <field name="description">V-EXTRA 0</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
-            <field name="base_code_id" ref="vat_code_a47"/>
-            <field name="ref_base_code_id" ref="vat_code_a49"/>
+            <field name="base_code_id" ref="vat_code_a46"/>
+            <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
         </record>
     <!-- Purchases VAT -->

addons/l10n_be/company.py

@@ -22,7 +22,7 @@ from osv import osv
 
 class res_company(osv.osv):
     _inherit = "res.company"
-    _description = 'res.company'
+    _description = 'Company'
 
     def _get_default_ad(self, addresses):
         city = post_code = address = country_code = ""

addons/l10n_be/security/ir.model.access.csv

@@ -1,2 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_vat_listing_clients","vat.listing.clients","model_vat_listing_clients",,1,1,1,1
+"access_partner_vat_intra","partner.vat.intra","model_partner_vat_intra",,1,1,1,1
+"access_partner_vat","partner.vat","model_partner_vat",,1,1,1,1
+"access_partner_vat_list","partner.vat.list","model_partner_vat_list",,1,1,1,1
+"access_l1on_be_vat_declaration","l1on_be.vat.declaration","model_l1on_be_vat_declaration",,1,1,1,1

addons/l10n_be/wizard/l10n_be_account_vat_declaration.py

@@ -36,7 +36,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'file_save': fields.binary('Save File'),
         'ask_resitution': fields.boolean('Ask Restitution'),
         'ask_payment': fields.boolean('Ask Payment'),
-        'client_nihil': fields.boolean('Last Declaration of Entreprise',help='Thick this case only if it concerns only the last statement on the civil or cessation of activity'),
+        'client_nihil': fields.boolean('Last Declaration of Enterprise',help='Tick this case only if it concerns only the last statement on the civil or cessation of activity'),
     }
 
     _defaults = {

addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml

@@ -14,11 +14,11 @@
             <field name="arch" type="xml">
 			<form string="Select Period">
                	<group  colspan="4" >
-					    <field name="period_id" select="1"/>
-              <field name="ask_resitution"/>
-              <field name="ask_payment"/>
-              <field name="client_nihil"/>
-              		<button colspan="1" name="create_xml" string="Create XML" type="object"/>
+					<field name="period_id" select="1"/>
+					<field name="ask_resitution"/>
+					<field name="ask_payment"/>
+					<field name="client_nihil"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
               	 </group>
               	 <separator string="XML Flie has been Created." colspan="4"/>
               	 <group colspan="4" >

addons/lunch/lunch.py

@@ -91,7 +91,7 @@ class lunch_cashmove(osv.osv):
     """ Move cash """
 
     _name = 'lunch.cashmove'
-    _description = "Move cash"
+    _description = "Cash Move"
 
     _columns = {
         'name': fields.char('Name', size=128),

addons/marketing_campaign/marketing_campaign.py

@@ -33,7 +33,7 @@ _intervalTypes = {
 
 class marketing_campaign(osv.osv): #{{{
     _name = "marketing.campaign"
-    _description = "Marketing Campaigns"
+    _description = "Marketing Campaign"
     
     _columns = {
         'name': fields.char('Name', size=64, required=True),
@@ -58,7 +58,7 @@ marketing_campaign()#}}}
 
 class marketing_campaign_segment(osv.osv): #{{{
     _name = "marketing.campaign.segment"
-    _description = "Marketing Campaign Segments"
+    _description = "Campaign Segment"
 
     _columns = {
         'name': fields.char('Name', size=64,required=True),
@@ -85,7 +85,7 @@ marketing_campaign_segment()#}}}
 
 class marketing_campaign_activity(osv.osv): #{{{
     _name = "marketing.campaign.activity"
-    _description = "Marketing Campaign Activities"
+    _description = "Campaign Activity"
 
     _columns = {
         'name': fields.char('Name', size=64),
@@ -135,7 +135,7 @@ marketing_campaign_activity()#}}}
 
 class marketing_campaign_transition(osv.osv): #{{{
     _name = "marketing.campaign.transition"
-    _description = "Campaign Transitions"
+    _description = "Campaign Transition"
 
     _columns = {
         'activity_from_id': fields.many2one('marketing.campaign.activity',
@@ -159,7 +159,7 @@ marketing_campaign_transition() #}}}
 
 class marketing_campaign_workitem(osv.osv): #{{{
     _name = "marketing.campaign.workitem"
-    _description = "Campaign Workitems"
+    _description = "Campaign Workitem"
 
     _columns = {
         'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',

addons/membership/membership.py

@@ -28,7 +28,7 @@ import decimal_precision as dp
 
 STATE = [
     ('none', 'Non Member'),
-    ('canceled', 'Canceled Member'),
+    ('canceled', 'Cancelled Member'),
     ('old', 'Old Member'),
     ('waiting', 'Waiting Member'),
     ('invoiced', 'Invoiced Member'),
@@ -162,8 +162,9 @@ class membership_line(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids):
             cr.execute('''
-            SELECT i.state FROM
-            account_invoice i WHERE
+            SELECT i.state, i.id FROM
+            account_invoice i
+            WHERE
             i.id = (
                 SELECT l.invoice_id FROM
                 account_invoice_line l WHERE
@@ -186,6 +187,10 @@ class membership_line(osv.osv):
                 state = 'invoiced'
             elif istate == 'paid':
                 state = 'paid'
+                inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1])
+                for payment in inv.payment_ids:
+                    if payment.invoice and payment.invoice.type == 'out_refund':
+                        state = 'canceled'
             elif istate == 'cancel':
                 state = 'canceled'
             res[line.id] = state
@@ -253,11 +258,15 @@ class Partner(osv.osv):
             s = 4
             if partner_data.member_lines:
                 for mline in partner_data.member_lines:
-                    if mline.date_from <= today and mline.date_to >= today:
+                    if mline.date_to >= today:
                         if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
                             mstate = mline.account_invoice_line.invoice_id.state
                             if mstate == 'paid':
                                 s = 0
+                                inv = mline.account_invoice_line.invoice_id
+                                for payment in inv.payment_ids:
+                                    if payment.invoice.type == 'out_refund':
+                                        s = 2
                                 break
                             elif mstate == 'open' and s!=0:
                                 s = 1
@@ -332,14 +341,12 @@ class Partner(osv.osv):
         '''Return the cancel date of membership'''
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
-        for partner_id in ids:
-            line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                    limit=1, order='date_cancel')
-            if line_id:
-                res[partner_id] = member_line_obj.read(cr, uid, line_id[0],
-                        ['date_cancel'])['date_cancel']
-            else:
-                res[partner_id] = False
+        for partner in self.browse(cr, uid, ids, context=context):
+            res[partner.id] = False
+            if partner.membership_state == 'canceled':
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
+                if line_id:
+                    res[partner.id] = member_line_obj.read(cr, uid, line_id[0],['date_cancel'])['date_cancel']
         return res
 
     def _get_partners(self, cr, uid, ids, context={}):
@@ -349,20 +356,23 @@ class Partner(osv.osv):
             ids+=ids2
         return ids
 
+    def __get_membership_state(self, *args, **kwargs):
+        return self._membership_state(*args, **kwargs)
+    
     _columns = {
         'associate_member': fields.many2one('res.partner', 'Associate member'),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
         'free_member': fields.boolean('Free member'),
         'membership_amount': fields.float(
-                    'Membership amount', digites=(16, 2),
+                    'Membership amount', digits=(16, 2),
                     help='The price negociated by the partner'),
         'membership_state': fields.function(
-                    _membership_state, method = True,
+                    __get_membership_state, method = True,
                     string = 'Current membership state', type = 'selection',
                     selection = STATE ,store = {
                         'account.invoice':(_get_invoice_partner,['state'], 10),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
-                        'res.partner':(_get_partners, ['free_member', 'membership_state'], 10)
+                        'res.partner':(_get_partners, ['free_member', 'membership_state','associate_member'], 10)
                         }
                     ),
         'membership_start': fields.function(
@@ -388,7 +398,7 @@ class Partner(osv.osv):
                     _membership_cancel, method = True,
                     string = 'Cancel membership date', type='date',
                     store = {
-                        'account.invoice':(_get_invoice_partner,['state'], 10),
+                        'account.invoice':(_get_invoice_partner,['state'], 11),
                         'membership.membership_line':(_get_partner_id,['state'], 10),
                         'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
                         }
@@ -412,7 +422,16 @@ class Partner(osv.osv):
     _constraints = [
         (_check_recursion, 'Error ! You can not create recursive associated members.', ['associate_member'])
     ]
-
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}    
+        default = default.copy()
+        default['member_lines'] = []
+        return super(Partner, self).copy(cr, uid, id, default, context)
+    
 Partner()
 
 class product_template(osv.osv):
@@ -439,8 +458,6 @@ class Product(osv.osv):
 
     '''Product'''
     _inherit = 'product.product'
-    _description = 'product.product'
-
     _columns = {
             'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
             'membership_date_from': fields.date('Date from'),
@@ -547,80 +564,6 @@ class ReportPartnerMemberYear(osv.osv):
 ReportPartnerMemberYear()
 
 
-class ReportPartnerMemberYearNew(osv.osv):
-    '''New Membership by Years'''
-
-    _name = 'report.partner_member.year_new'
-    _description = __doc__
-    _auto = False
-    _rec_name = 'year'
-
-    _columns = {
-        'year': fields.char('Year', size='4', readonly=True, select=1),
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-    }
-
-    def init(self, cr):
-        '''Create the view'''
-        cr.execute("""
-    CREATE OR REPLACE VIEW report_partner_member_year AS (
-        SELECT
-        MIN(id) AS id,
-        COUNT(ncanceled) as canceled_number,
-        COUNT(npaid) as paid_number,
-        COUNT(ninvoiced) as invoiced_number,
-        COUNT(nwaiting) as waiting_number,
-        SUM(acanceled) as canceled_amount,
-        SUM(apaid) as paid_amount,
-        SUM(ainvoiced) as invoiced_amount,
-        SUM(awaiting) as waiting_amount,
-        year,
-        currency
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
-            TO_CHAR(ml.date_from, 'YYYY') AS year,
-            ai.currency_id AS currency,
-            MIN(ml.id) AS id
-            FROM membership_membership_line ml
-            JOIN (account_invoice_line ail
-                LEFT JOIN account_invoice ai
-                ON (ail.invoice_id = ai.id))
-            ON (ml.account_invoice_line = ail.id)
-            JOIN res_partner p
-            ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
-            ai.currency_id, ml.id) AS foo
-        GROUP BY year, currency)
-                """)
-
-ReportPartnerMemberYear()
-
-
 class ReportPartnerMemberYearNew(osv.osv):
     '''New Membership by Years'''
 
@@ -703,28 +646,30 @@ ReportPartnerMemberYearNew()
 
 class account_invoice_line(osv.osv):
     _inherit='account.invoice.line'
+    
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context={}
         res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
         member_line_obj = self.pool.get('membership.membership_line')
         for line in self.browse(cr, uid, ids):
-            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
-            if line.product_id and line.product_id.membership and not ml_ids:
-                # Product line has changed to a membership product
-                date_from = line.product_id.membership_date_from
-                date_to = line.product_id.membership_date_to
-                if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
-                    date_from = line.invoice_id.date_invoice
-                line_id = member_line_obj.create(cr, uid, {
-                    'partner': line.invoice_id.partner_id.id,
-                    'date_from': date_from,
-                    'date_to': date_to,
-                    'account_invoice_line': line.id,
-                    })
-            if line.product_id and not line.product_id.membership and ml_ids:
-                # Product line has changed to a non membership product
-                member_line_obj.unlink(cr, uid, ml_ids, context=context)
+            if line.invoice_id.type == 'out_invoice':
+                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+                if line.product_id and line.product_id.membership and not ml_ids:
+                    # Product line has changed to a membership product
+                    date_from = line.product_id.membership_date_from
+                    date_to = line.product_id.membership_date_to
+                    if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+                        date_from = line.invoice_id.date_invoice
+                    line_id = member_line_obj.create(cr, uid, {
+                        'partner': line.invoice_id.partner_id.id,
+                        'date_from': date_from,
+                        'date_to': date_to,
+                        'account_invoice_line': line.id,
+                        })
+                if line.product_id and not line.product_id.membership and ml_ids:
+                    # Product line has changed to a non membership product
+                    member_line_obj.unlink(cr, uid, ml_ids, context=context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
@@ -739,20 +684,21 @@ class account_invoice_line(osv.osv):
     def create(self, cr, uid, vals, context={}):
         result = super(account_invoice_line, self).create(cr, uid, vals, context)
         line = self.browse(cr, uid, result)
-        member_line_obj = self.pool.get('membership.membership_line')
-        ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
-        if line.product_id and line.product_id.membership and not ml_ids:
-            # Product line is a membership product
-            date_from = line.product_id.membership_date_from
-            date_to = line.product_id.membership_date_to
-            if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
-                date_from = line.invoice_id.date_invoice
-            line_id = member_line_obj.create(cr, uid, {
-                'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
-                'date_from': date_from,
-                'date_to': date_to,
-                'account_invoice_line': line.id,
-                })
+        if line.invoice_id.type == 'out_invoice':
+            member_line_obj = self.pool.get('membership.membership_line')
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+            if line.product_id and line.product_id.membership and not ml_ids:
+                # Product line is a membership product
+                date_from = line.product_id.membership_date_from
+                date_to = line.product_id.membership_date_to
+                if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+                    date_from = line.invoice_id.date_invoice
+                line_id = member_line_obj.create(cr, uid, {
+                    'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
+                    'date_from': date_from,
+                    'date_to': date_to,
+                    'account_invoice_line': line.id,
+                    })
         return result
 
 account_invoice_line()

addons/membership/membership_view.xml

@@ -53,8 +53,8 @@
                     <page string="Membership">
                         <field name="membership" readonly="0"/>
                         <newline/>
-                        <field name="membership_date_from" readonly="0"/>
-                        <field name="membership_date_to" readonly="0"/>
+                        <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                        <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                     </page>
                 </page>
             </field>

addons/membership/security/ir.model.access.csv

@@ -3,3 +3,5 @@
 "access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
 "access_report_partner_member_year","report.partner_member.year","model_report_partner_member_year","base.group_partner_manager",1,0,0,0
 "access_report_partner_member_year_new","report.partner_member.year_new","model_report_partner_member_year_new","base.group_partner_manager",1,0,0,0
+"access_membership_invoice","membership.invoice","model_membership_invoice",,1,1,1,1
+"access_membership_unpaid_invoice","membership.unpaid.invoice","model_membership_unpaid_invoice",,1,0,0,0

addons/mrp/mrp.py

@@ -94,7 +94,7 @@ class mrp_routing_workcenter(osv.osv):
     Defines working cycles and hours of a workcenter using routings.
     """
     _name = 'mrp.routing.workcenter'
-    _description = 'Routing workcenter usage'
+    _description = 'Workcenter Usage'
     _columns = {
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
         'name': fields.char('Name', size=64, required=True),
@@ -118,7 +118,7 @@ class mrp_bom(osv.osv):
     Defines bills of material for a product.
     """
     _name = 'mrp.bom'
-    _description = 'Bills of Material'
+    _description = 'Bill of Material'
     
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
         """ Gets child bom.
@@ -314,7 +314,6 @@ class mrp_bom(osv.osv):
                     d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
                     mult = (d + (m and 1.0 or 0.0))
                     cycle = mult * wc_use.cycle_nbr
-                    print mult, wc_use.hour_nbr, wc.time_start, wc.time_stop, cycle
                     result2.append({
                         'name': bom.routing_id.name,
                         'workcenter_id': wc.id,
@@ -351,8 +350,7 @@ mrp_bom()
 
 class mrp_bom_revision(osv.osv):
     _name = 'mrp.bom.revision'
-    _description = 'Bill of material revisions'
-    
+    _description = 'Bill of Material Revision'
     _columns = {
         'name': fields.char('Modification name', size=64, required=True),
         'description': fields.text('Description'),
@@ -419,8 +417,9 @@ class mrp_production(osv.osv):
     Production Orders / Manufacturing Orders
     """
     _name = 'mrp.production'
-    _description = 'Production'
-    _date_name  = 'date_planned'    
+    _description = 'Manufacturing Order'
+    _date_name  = 'date_planned'
+    _log_create = True
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
         """ Calculates total hours and total no. of cycles for a production order.
@@ -648,6 +647,9 @@ class mrp_production(osv.osv):
         """ Changes the production state to Ready and location id of stock move.
         @return: True
         """
+        for (id,name) in self.name_get(cr, uid, ids):
+            message = _('Manufacturing Order ') + " '" + name + "' "+ _("is ready to produce.")
+            self.log(cr, uid, id, message)
         move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state': 'ready'})
         for production in self.browse(cr, uid, ids):
@@ -934,7 +936,7 @@ mrp_production()
 
 class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
-    _description = 'Work Orders'
+    _description = 'Work Order'
     _order = 'sequence'
     
     _columns = {
@@ -954,8 +956,7 @@ mrp_production_workcenter_line()
 
 class mrp_production_product_line(osv.osv):
     _name = 'mrp.production.product.line'
-    _description = 'Production scheduled products'
-    
+    _description = 'Production Scheduled Product'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),

addons/mrp/mrp_demo.xml

@@ -170,7 +170,7 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
 
         <record id="mrp_bom_1" model="mrp.bom">
@@ -179,21 +179,21 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc2" />
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
             <field name="sequence">8</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC3')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc3"/>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
             <field name="sequence">11</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC4')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc4"/>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -201,7 +201,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -209,7 +209,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_21"/>
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -217,7 +217,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -225,7 +225,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
@@ -233,7 +233,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
@@ -242,14 +242,14 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
             <field name="sequence">33</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC0')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -257,7 +257,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
 
         <record id="mrp_bom_13" model="mrp.bom">
@@ -265,7 +265,7 @@
             <field name="sequence">38</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu3"/>
         </record>
 
         <record id="mrp_bom_kit" model="mrp.bom">
@@ -276,7 +276,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_clavier" model="mrp.bom">
             <field name="name">Keyboard</field>
@@ -284,7 +284,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_24"/>
         </record>
         <record id="mrp_bom_mouse" model="mrp.bom">
             <field name="name">Mouse</field>
@@ -292,7 +292,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_16" model="mrp.bom">
             <field name="name">Moon PC</field>
@@ -300,7 +300,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
         </record>
         <record id="mrp_bom_18" model="mrp.bom">
             <field name="name">Mainboard ASUStek A7N8X</field>
@@ -308,7 +308,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb2"/>
         </record>
         <record id="mrp_bom_19" model="mrp.bom">
             <field name="name">Processor AMD Athlon 2200+</field>
@@ -316,7 +316,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu2"/>
         </record>
         <record id="mrp_bom_1900" model="mrp.bom">
             <field name="name">Regular Case Fan</field>
@@ -324,7 +324,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
         </record>
         <record id="mrp_bom_23" model="mrp.bom">
             <field name="name">DDR 256MB PC333</field>
@@ -332,7 +332,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_11"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram"/>
         </record>
         <record id="mrp_bom_1901" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
@@ -340,7 +340,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram512"/>
         </record>
         <record id="mrp_bom_22" model="mrp.bom">
             <field name="name">DDR 1024MB PC400</field>
@@ -348,7 +348,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_5"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram512"/>
         </record>
         <record id="mrp_bom_24" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -356,7 +356,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_7"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD3')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd3"/>
         </record>
         <record id="mrp_bom_25" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -365,7 +365,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_4"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_26" model="mrp.bom">
             <field name="name">RAM on demand</field>
@@ -373,7 +373,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_21"/>
         </record>
         <record id="mrp_bom_27" model="mrp.bom">
             <field name="name">HDD on demand</field>
@@ -381,7 +381,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_28" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -390,7 +390,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_29" model="mrp.bom">
             <field name="name">Processor on demand</field>
@@ -399,7 +399,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_30" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -408,7 +408,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_31" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -417,7 +417,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_32" model="mrp.bom">
             <field name="name">High speed processor config</field>
@@ -426,7 +426,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu2"/>
         </record>
         <record id="mrp_bom_33" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -435,7 +435,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_6"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd2"/>
         </record>
         <record id="mrp_bom_34" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -444,7 +444,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_35" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -453,7 +453,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_36" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -462,7 +462,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd2"/>
         </record>
         <record id="mrp_bom_processor" model="mrp.bom">
             <field name="name">processor</field>
@@ -471,7 +471,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
         </record>
         <record id="mrp_bom_38" model="mrp.bom">
             <field name="name">mainboard</field>
@@ -480,7 +480,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb1"/>
         </record>
         <record id="mrp_bom_fan" model="mrp.bom">
             <field name="name">fan</field>
@@ -489,7 +489,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
         </record>
         <record id="mrp_bom_ram" model="mrp.bom">
             <field name="name">RAM</field>
@@ -498,7 +498,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram"/>
         </record>
         <record id="mrp_bom_41" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -507,7 +507,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_42" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -516,7 +516,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_43" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -525,7 +525,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
 
         <record id="mrp_bom_kit2" model="mrp.bom">
@@ -536,7 +536,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KIT0')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_26"/>
         </record>
         <record id="mrp_bom_mouse2" model="mrp.bom">
             <field name="name">Mouse</field>
@@ -544,7 +544,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_clavier2" model="mrp.bom">
             <field name="name">Keyboard</field>
@@ -552,7 +552,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_24"/>
         </record>
 
     </data>

addons/mrp/mrp_order_point.xml

@@ -9,7 +9,7 @@
             <field name="product_min_qty">5.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
@@ -17,7 +17,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
@@ -25,7 +25,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
@@ -33,7 +33,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
@@ -41,7 +41,7 @@
             <field name="product_min_qty">3.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
@@ -49,7 +49,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
     </data>

addons/mrp/stock.py

@@ -27,6 +27,77 @@ import ir
 import netsvc
 import time
 
+
+class stock_warehouse_orderpoint(osv.osv):
+    """
+    Defines Minimum stock rules.
+    """
+    _name = "stock.warehouse.orderpoint"
+    _description = "Minimum Inventory Rule"
+    
+    _columns = {
+        'name': fields.char('Name', size=32, required=True),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
+        'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
+        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
+        'product_min_qty': fields.float('Min Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'product_max_qty': fields.float('Max Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'qty_multiple': fields.integer('Qty Multiple', required=True,
+            help="The procurement quantity will by rounded up to this multiple."),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement', ondelete="set null"),
+        'company_id': fields.many2one('res.company','Company',required=True),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+        'logic': lambda *a: 'max',
+        'qty_multiple': lambda *a: 1,
+        'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
+        'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
+    }
+    _sql_constraints = [
+        ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', _('Qty Multiple must be greater than zero.')),
+    ]   
+    
+    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+        """ Finds location id for changed warehouse.
+        @param warehouse_id: Changed id of warehouse.
+        @return: Dictionary of values.
+        """
+        if warehouse_id:
+            w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
+            v = {'location_id': w.lot_stock_id.id}
+            return {'value': v}
+        return {}
+    
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        """ Finds UoM for changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr,uid,product_id)
+            v = {'product_uom': prod.uom_id.id}
+            return {'value': v}
+        return {}
+    
+    def copy(self, cr, uid, id, default=None,context={}):
+        if not default:
+            default = {}
+        default.update({
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+        })
+        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
+    
+stock_warehouse_orderpoint()
+
 class StockMove(osv.osv):
     _inherit = 'stock.move'
     

addons/mrp/wizard/mrp_product_produce.py

@@ -20,8 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import netsvc
 
 class mrp_product_produce(osv.osv_memory):
     _name = "mrp.product.produce"

addons/mrp_jit/__openerp__.py

@@ -27,19 +27,15 @@
     'description': """
     This module allows Just In Time computation of procurement orders.
 
-    If you install this module, you will not have to run the procurement scheduler
-    manually anymore, or wait for it to execute.
-    Each procurement order (resulting from a sale order, for instance) will be computed 
-    when confirmed, without waiting for the procurement scheduler to run.
-    
-    Warning: this does not take into account minimum stock rules (order points), which still 
-    require to run the appropriate scheduler, or wait for it to run nightly.
-     
-    Note that the procurement computation can be resource-intensive, so you may 
-    want to be careful with this, depending on your mrp configuration and system 
-    usage.
+    If you install this module, you will not have to run the regular procurement 
+    scheduler anymore (but you still need to run the minimum order point rule 
+    scheduler, or for example let it run daily.)
+    All procurement orders will be processed immediately, which could in some
+    cases entail a small performance impact.
+
     It may also increase your stock size because products are reserved as soon
-    as possible. In that case, you can not use priorities any more.
+    as possible and the scheduler time range is not taken into account anymore. 
+    In that case, you can not use priorities any more on the different picking.
     
     
     """,