openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895
  #694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
  https://bugs.launchpad.net/bugs/694144
  #695632 [RC1]Two same fields creating problem in web-client
  https://bugs.launchpad.net/bugs/695632
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #702805 an employee shouldn't be able to see expenses and holidays of others employee
  https://bugs.launchpad.net/bugs/702805
  #703836 [Trunk] hr_expense: Invoice button not working
  https://bugs.launchpad.net/bugs/703836

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/46465

[FIX] hr: added domain on 'Home Address' of Employee" --fixes lp:703836 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/46465
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'crm/__openerp__.py'
=== modified file 'hr/hr.py'
--- hr/hr.py	2011-01-14 00:11:01 +0000
+++ hr/hr.py	2011-01-17 11:19:04 +0000
@@ -146,7 +146,7 @@
         'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
         'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
-        'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
+        'address_home_id': fields.many2one('res.partner.address', 'Home Address', domain="[('partner_id', '!=', False)]"),
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),

=== modified file 'hr_timesheet/report/user_timesheet.py'
=== modified file 'mrp/mrp_view.xml'
=== modified file 'purchase/purchase.py'
=== modified file 'sale/sale.py'
=== modified file 'stock/stock.py'
=== modified file 'stock/stock_view.xml'