[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-editable-credit-psi into lp:~openerp-dev/openobject-addons/trunk-payroll

[Purnendu Singh (OpenERP)]

Purnendu Singh (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-payroll-editable-credit-psi into 
lp:~openerp-dev/openobject-addons/trunk-payroll.

Requested reviews:
  OpenERP RD Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-editable-credit-psi/+merge/62821

Hello,

Remove readonly=True from credit note field of hr.payslip object.

Thanks,
Purnendu singh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-editable-credit-psi/+merge/62821
Your team OpenERP RD Team is requested to review the proposed merge of 
lp:~openerp-dev/openobject-addons/trunk-payroll-editable-credit-psi into 
lp:~openerp-dev/openobject-addons/trunk-payroll.
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml	2011-05-26 16:56:10 +
+++ hr_payroll/hr_payroll_view.xml	2011-05-30 06:04:32 +
@@ -238,7 +238,7 @@
 field name=struct_id groups=base.group_extended attrs={'required':[('contract_id','lt;gt;',False)]}/
 field name=date_to/
 field name=name colspan=4/
-field name=credit_note readonly=1/
+field name=credit_note/
 /group
 notebook colspan=4
 page string=Salary Computation 

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-tab-rename-psi into lp:~openerp-dev/openobject-addons/trunk-payroll

[Mustufa Rangwala (Open ERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-tab-rename-psi/+merge/62820
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-payroll.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-editable-credit-psi into lp:~openerp-dev/openobject-addons/trunk-payroll

[Mustufa Rangwala (Open ERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-editable-credit-psi/+merge/62821
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-payroll.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into lp:~openerp-dev/openobject-addons/trunk-usability

[Tejaskumar Tank (OpenERP)]

Tejaskumar Tank (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into 
lp:~openerp-dev/openobject-addons/trunk-usability.

Requested reviews:
  Amit (Open ERP) (apa-tiny)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62826

Hello,


For purchase improvement, below changes are applied,

1) In po, second tab, in the selection Invoicing Control rename from 
picking into from reception  

2) Rename menu entry Purchase lines not invoiced (Purchases/Invoice 
Control/Purchase lines not invoiced) into on purchase order line  

3) Rename menu entry Picking to invoice  (Purchases/Invoice Control/Picking 
to invoice) into On Receptions  


Thanks,
Tejas
t...@openerp.com



-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62826
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-04-26 07:39:18 +
+++ purchase/purchase.py	2011-05-30 06:36:33 +
@@ -188,7 +188,7 @@
 'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
 'invoiced': fields.function(_invoiced, method=True, string='Invoiced  Paid', type='boolean', help=It indicates that an invoice has been paid),
 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
+'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True,
 help=From Order: a draft invoice will be pre-generated based on the purchase order. The accountant  \
 will just have to validate this invoice for control.\n \
 From Picking: a draft invoice will be pre-generated based on validated receptions.\n \

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2011-03-09 16:12:49 +
+++ purchase/purchase_view.xml	2011-05-30 06:36:33 +
@@ -455,7 +455,7 @@
 
 
 record id=purchase_line_form_action2 model=ir.actions.act_window
-field name=namePurchase Lines Not Invoiced/field
+field name=nameOn Purchase Order Line/field
 field name=typeir.actions.act_window/field
 field name=res_modelpurchase.order.line/field
 field name=domain[('order_id.invoice_method','lt;gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]/field

=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml	2011-05-26 07:43:35 +
+++ purchase/stock_view.xml	2011-05-30 06:36:33 +
@@ -103,7 +103,7 @@
 /record
  
 record id=action_picking_tree4_picking_to_invoice model=ir.actions.act_window
-field name=namePicking to Invoice/field
+field name=nameOn Receptions/field
 field name=res_modelstock.picking/field
 field name=typeir.actions.act_window/field
 field name=view_typeform/field

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado into lp:openobject-addons/6.0

[Amit Dodiya (OpenERP)]

Amit Dodiya (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado into 
lp:openobject-addons/6.0.

Requested reviews:
  Priyesh (Open ERP) (pso-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5937-ado/+merge/62839

Hello,

I have change the code of currency field in stock_partial_picking.py because 
the product should need company_id for currency.

Thanks.
Amit
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5937-ado/+merge/62839
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado.
=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py	2011-04-04 10:30:03 +
+++ stock/wizard/stock_partial_picking.py	2011-05-30 07:11:05 +
@@ -128,7 +128,7 @@
 if pick_type == 'in':
 move_memory.update({
 'cost' : picking.product_id.standard_price, 
-'currency' : picking.product_id.company_id.currency_id.id, 
+'currency' : picking.product_id.company_id and picking.product_id.company_id.currency_id.id or False, 
 })
 return move_memory
 

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado into lp:openobject-addons/6.0

[Jay Vora (OpenERP)]

The proposal to merge lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado into 
lp:openobject-addons/6.0 has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5937-ado/+merge/62839
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5937-ado/+merge/62839
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado into lp:openobject-addons/6.0

[Jay Vora (OpenERP)]

The proposal to merge lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado into 
lp:openobject-addons/6.0 has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5937-ado/+merge/62839
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5937-ado/+merge/62839
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/6.0-opw-5937-ado.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Review: Needs Fixing
conflicts detected in the branch as new changes made on the main project branch.

thanks,
mra
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-usability-bde/+merge/61218
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-add-date-field-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Hello,

layout for the depreciaiton method and duration of asset than in asset category 
form view 
  = already done in 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-usability-bde/+merge/61218
 merge.

Thank you,
mra
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-add-date-field-bde/+merge/62604
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-add-date-field-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

more in this:

https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve-view-bde/+merge/61118
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-add-date-field-bde/+merge/62604
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Review: Needs Fixing
Conflicts detected.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco/+merge/61402
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-server/trunk-bug-trml2pdf_improvement-nco into lp:openobject-server

[Naresh(OpenERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-trml2pdf_improvement-nco/+merge/62851
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-trml2pdf_improvement-nco.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Ujjvala Collins (OpenERP)]

Review: Resubmit
Hello Sir,

I have resolved the conflicts. Please check.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco/+merge/61402
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into lp:~openerp-dev/openobject-addons/trunk-usability

[Amit (Open ERP)]

Review: Approve
seems ok...

Thanks,
Amit
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62826
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-contact-google-sync-backlog_correction-dbr into lp:~openerp-dev/openobject-addons/trunk-contact-google-sync

[Jigar Amin - OpenERP]

Jigar Amin - OpenERP has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-contact-google-sync-backlog_correction-dbr
 into lp:~openerp-dev/openobject-addons/trunk-contact-google-sync.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-contact-google-sync-backlog_correction-dbr/+merge/62853

Changes :
  Backlog Validation import google contact
Kindly Review this
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-contact-google-sync-backlog_correction-dbr/+merge/62853
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-contact-google-sync.
=== modified file 'import_google_contact/__init__.py'
--- import_google_contact/__init__.py	2011-05-10 13:29:01 +
+++ import_google_contact/__init__.py	2011-05-30 09:49:25 +
@@ -21,7 +21,5 @@
 
 import import_google_contact
 import wizard
-import import_google_contact_installer
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'import_google_contact/__openerp__.py'
--- import_google_contact/__openerp__.py	2011-05-10 13:29:01 +
+++ import_google_contact/__openerp__.py	2011-05-30 09:49:25 +
@@ -30,7 +30,6 @@
 'depends': ['base','google_base_account'],
 'init_xml': [],
 'update_xml': [
-  'import_google_contact_installer_view.xml',
   'wizard/google_contact_import_view.xml'
],
 'demo_xml': [],

=== removed file 'import_google_contact/import_google_contact_installer.py'
--- import_google_contact/import_google_contact_installer.py	2011-05-10 13:29:01 +
+++ import_google_contact/import_google_contact_installer.py	1970-01-01 00:00:00 +
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##
-#
-#OpenERP, Open Source Management Solution
-#Copyright (C) 2004-2010 Tiny SPRL (http://tiny.be).
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU Affero General Public License as
-#published by the Free Software Foundation, either version 3 of the
-#License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU Affero General Public License for more details.
-#
-#You should have received a copy of the GNU Affero General Public License
-#along with this program.  If not, see http://www.gnu.org/licenses/.
-#
-##
-
-from osv import fields, osv
-from tools.translate import _
-try:
-import gdata.contacts.service
-except ImportError:
-raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
-
-class google_installer_crm(osv.osv_memory):
-	_name = 'google.installer.crm'
-	_inherit = 'res.config.installer'
-	_columns =	{
-		'user': fields.char('Google Username', size=64, required=True),
-		'password': fields.char('Google Password', size=64)
-	}
-	
-	def google_login(self, user, password, type='group', context=None):
-		gd_client = gdata.contacts.service.ContactsService()
-		try:
-			gd_client.ClientLogin(user, password,gd_client.source)
-		except Exception:
-			return False
-		return gd_client
-	
-	def login(self, cr, uid, ids, context=None):
-		data = self.read(cr, uid, ids)[0]
-		user = data['user']
-		password = data['password']
-		if self.google_login(user, password):
-			res = {
-   'gmail_user': user,
-   'gmail_password': password
-}
-			self.pool.get('res.users').write(cr, uid, uid, res, context=context)
-		else:
-			raise osv.except_osv(_('Error'), _(Authentication failed! Check the user and password !))
-		return self.action_next(cr, uid, ids, context=context)
-	
-google_installer_crm()

=== removed file 'import_google_contact/import_google_contact_installer_view.xml'
--- import_google_contact/import_google_contact_installer_view.xml	2011-05-10 13:29:01 +
+++ import_google_contact/import_google_contact_installer_view.xml	1970-01-01 00:00:00 +
@@ -1,65 +0,0 @@
-openerp
-  data
-record id=view_crm_inherit_id model=ir.ui.view
-  field name=nameGoogle From/field
-  field name=modelgoogle.installer.crm/field
-  field name=typeform/field
-  field name=inherit_id ref=base.res_config_installer/
-  field name=arch type=xml
-
-  form position=attributes
-attribute name=stringImport your contacts from Google/attribute
-  /form
-		 separator string=title position=attributes
-attribute name=stringEnter Your Google Connection Data/attribute
-  

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-client/6.0-opw-5921-ysa into lp:openobject-client/6.0

[Naresh(OpenERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-client/6.0-opw-5921-ysa/+merge/62446
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-client/6.0-opw-5921-ysa.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

[Mustufa Rangwala (Open ERP)]

Review: Needs Fixing
if we found total debit  total credit for the move ..you have to create 
Adjustment Entry.

thanks,
mra
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr/+merge/61090
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-payroll.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into lp:~openerp-dev/openobject-addons/trunk-usability

[Raphael Collet (OpenERP)]

Could you upgrade the translation template purchase/i18n/purchase.pot?
This will enable people to fix translations of those terms, too.

Thanks,
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62826
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Review: Needs Fixing
if i select protata temp. and compute the depr. lines.. amount to deprt for 
last line should be 0.0
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco/+merge/61402
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into lp:~openerp-dev/openobject-addons/trunk-usability

[Tejaskumar Tank (OpenERP)]

Review: Resubmit
Hello,


I have updated the purchase/i18n/purchase.pot.


Thanks,
Tejas - t...@openerp.com
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62826
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into lp:~openerp-dev/openobject-addons/trunk-usability

[Tejaskumar Tank (OpenERP)]

Tejaskumar Tank (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into 
lp:~openerp-dev/openobject-addons/trunk-usability.

Requested reviews:
  Amit (Open ERP) (apa-tiny)
  Tejaskumar Tank (OpenERP) (tta-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62859

 


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62859
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot	2011-01-17 10:19:58 +
+++ purchase/i18n/purchase.pot	2011-05-30 10:38:23 +
@@ -56,7 +56,7 @@
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
-msgid From Picking
+msgid From Reception
 msgstr 
 
 #. module: purchase
@@ -883,7 +883,13 @@
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
-msgid Purchase Lines Not Invoiced
+msgid On Purchase Order Line
+msgstr 
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.action_picking_tree4_picking_to_invoice
+msgid On Receptions
 msgstr 
 
 #. module: purchase

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-04-26 07:39:18 +
+++ purchase/purchase.py	2011-05-30 10:38:23 +
@@ -188,7 +188,7 @@
 'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
 'invoiced': fields.function(_invoiced, method=True, string='Invoiced  Paid', type='boolean', help=It indicates that an invoice has been paid),
 'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
+'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Reception')], 'Invoicing Control', required=True,
 help=From Order: a draft invoice will be pre-generated based on the purchase order. The accountant  \
 will just have to validate this invoice for control.\n \
 From Picking: a draft invoice will be pre-generated based on validated receptions.\n \

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2011-03-09 16:12:49 +
+++ purchase/purchase_view.xml	2011-05-30 10:38:23 +
@@ -455,7 +455,7 @@
 
 
 record id=purchase_line_form_action2 model=ir.actions.act_window
-field name=namePurchase Lines Not Invoiced/field
+field name=nameOn Purchase Order Line/field
 field name=typeir.actions.act_window/field
 field name=res_modelpurchase.order.line/field
 field name=domain[('order_id.invoice_method','lt;gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]/field

=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml	2011-05-26 07:43:35 +
+++ purchase/stock_view.xml	2011-05-30 10:38:23 +
@@ -103,7 +103,7 @@
 /record
  
 record id=action_picking_tree4_picking_to_invoice model=ir.actions.act_window
-field name=namePicking to Invoice/field
+field name=nameOn Receptions/field
 field name=res_modelstock.picking/field
 field name=typeir.actions.act_window/field
 field name=view_typeform/field

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into lp:~openerp-dev/openobject-addons/trunk-usability

[Amit (Open ERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62826
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-usability-purchase-tta into lp:~openerp-dev/openobject-addons/trunk-usability

[Amit (Open ERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-purchase-tta/+merge/62859
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-usability.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-785649-psi into lp:openobject-addons

[Purnendu Singh (OpenERP)]

Purnendu Singh (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-785649-psi into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #785649 in OpenERP Addons: general ledger - do not print lines with all 
zero
  https://bugs.launchpad.net/openobject-addons/+bug/785649

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785649-psi/+merge/62861

Hello,

Fixes:785649
https://bugs.launchpad.net/openobject-addons/+bug/785649

description :
 general ledger - do not print lines with all zero


Thanks,
Purnendu Singh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-785649-psi/+merge/62861
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-785649-psi.
=== modified file 'account/report/account_general_ledger.py'
--- account/report/account_general_ledger.py	2011-05-06 06:43:56 +
+++ account/report/account_general_ledger.py	2011-05-30 11:06:20 +
@@ -174,7 +174,7 @@
 LEFT JOIN account_invoice i on (m.id =i.move_id)
 LEFT JOIN account_period per on (per.id=l.period_id)
 JOIN account_journal j on (l.journal_id=j.id)
-WHERE %s AND m.state IN %s AND l.account_id = %%s ORDER by %s
+WHERE %s AND (l.debit  0 OR l.credit  0) AND m.state IN %s AND l.account_id = %%s ORDER by %s
  %(self.query, tuple(move_state), sql_sort)
 self.cr.execute(sql, (account.id,))
 res_lines = self.cr.dictfetchall()

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa into lp:openobject-server

[Yogesh(Open ERP)]

Yogesh(Open ERP) has proposed merging 
lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa into 
lp:openobject-server.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)
Related bugs:
  Bug #723662 in OpenERP Server: Unable to print 0.00 float value on a report
  https://bugs.launchpad.net/openobject-server/+bug/723662

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-723662-ysa/+merge/62862
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-723662-ysa/+merge/62862
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa.
=== modified file 'openerp/report/report_sxw.py'
--- openerp/report/report_sxw.py	2011-05-09 08:46:41 +
+++ openerp/report/report_sxw.py	2011-05-30 11:09:45 +
@@ -86,7 +86,7 @@
 digits = self._field.digits[1]
 if hasattr(self, 'lang_obj'):
 return self.lang_obj.format('%.' + str(digits) + 'f', self.name, True)
-return self.val
+return str(self.val)
 
 class _int_format(int, _format):
 def __init__(self,value):

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-configuration-rework-product-terminlg-aag into lp:~openerp-dev/openobject-addons/trunk-configuration-rework

[Atik Agewan(OpenERP)]

Atik Agewan(OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-product-terminlg-aag
 into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-product-terminlg-aag/+merge/62863


Hello 

 Now with specify Your Terminology wiz user can translate menu name.

Thanks
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-product-terminlg-aag/+merge/62863
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'base_setup/installer.py'
--- base_setup/installer.py	2011-05-27 12:48:35 +
+++ base_setup/installer.py	2011-05-30 11:09:48 +
@@ -269,10 +269,10 @@
 trans_obj = self.pool.get('ir.translation')
 user_obj = self.pool.get('res.users')
 context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
-existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src)])
-if existing_trans_ids:
-trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
-else:
+existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('res_id','=',res_id)])
+for existing_trans_id in existing_trans_ids:
+trans_obj.write(cr, uid, existing_trans_id, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
+if not existing_trans_ids:
 create_id = trans_obj.create(cr, uid, {'name': name,'lang': context_lang, 'type': type, 'src': src, 'value': value , 'res_id': res_id}, context=context)
 return {}
 

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Bharat Devnani (Open ERP)]

Review: Resubmit
Hello Sir,


Conflicts are resolved.


Thanks  Regards, 
Devnani Bharat R.


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-usability-bde/+merge/61218
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-782164-ara into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-782164-ara 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782164-ara/+merge/62245
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782164-ara/+merge/62245
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-782164-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Review: Disapprove
branch seems weired.
for sake of clarity i reject this branch and please create new merge proposal 
for above feature.

thanks,
mra

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-usability-bde/+merge/61218
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

The proposal to merge 
lp:~openerp-dev/openobject-addons/trunk-account-asset-usability-bde into 
lp:~openerp-dev/openobject-addons/trunk-account-asset has been updated.

Status: Needs review = Rejected

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-usability-bde/+merge/61218
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-usability-bde/+merge/61218
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

[Mustufa Rangwala (Open ERP)]

As we have removed the Account from Contribution register..there is no need of 
Analytic account too on it. So remove that field too ;)

Thanks,
mra
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr/+merge/61090
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-payroll.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa into lp:openobject-server

[Naresh(OpenERP)]

or change the __init__ of floatlike 'int'
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-723662-ysa/+merge/62862
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa into lp:openobject-server

[Yogesh(Open ERP)]

Review: Resubmit
Improvements are done.
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-723662-ysa/+merge/62862
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa into lp:openobject-server

[Naresh(OpenERP)]

I think the best way is to respect the Python conventions i.e the return 
value of __str___ should be a string...can you please make this chang
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-723662-ysa/+merge/62862
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa into lp:openobject-server

[Yogesh(Open ERP)]

Improvements are done as per your suggestion.
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-723662-ysa/+merge/62862
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] OpenERP Web 6.1 split from openobject-client-web

[Xavier Morel]

Currently, proto61 is a branch of openobject-client-web. But since everything 
has been changed, it does not really make sense to keep as is, so al has 
decided that proto61 was going to move to different project at openerp-web 
[0]: 

The history of the project will also be cleaned: it will only be kept from 
revision a...@openerp.com-20110302185606-186mpawq3ba7rp2e onwards, every 
revision before that will be removed from the project's history (so we only get 
relevant part).

I will be doing conversion starting at ~16:00 UTC (21:30 IST, 18:00 CEST) so 
that it is ready for indian team tomorrow morning.

I will be converting trunk (current proto61[1]), but I will also try to convert 
all other proto61 branches so teams do not have to redo their commits. I can 
not guarantee anything, but I will send email with status once I am done, so 
everybody know how it went and if branches failed to convert have list of them 
so there is no surprise.

As a result, I would recommend that all committed but not yet pushed work be 
pushed to launchpad at end of today, so that it is converted along with rest.

If any question, do not hesitate asking.

Xavier

[0] https://launchpad.net/openerp-web
[1] https://code.launchpad.net/~openerp-dev/openobject-client-web/trunk-proto61
___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Bug 768106] Re: Got an error When one2many or many2many inside a one2many wizard

[anoop]

Hi Devishree Brahmbhatt

Is this bug fixed in webclient  ? . 
Or how can solve this problem in web client ?

regards
anoop

-- 
You received this bug notification because you are a member of OpenERP
SA's Web Client RD, which is a bug assignee.
https://bugs.launchpad.net/bugs/768106

Title:
  Got an error When one2many or many2many inside a one2many wizard

Status in OpenERP Web Client:
  Confirmed

Bug description:
  Got an error When one2many or many2many inside a one2many wizard .When
  select data into the many2many , i got the below error .

  
The above is a description of an error in a Python program.  Here is
  the original traceback:

  Traceback (most recent call last):
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cprequest.py,
 line 606, in respond
  cherrypy.response.body = self.handler()
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/controllers/_root.py, line 87, in default
  return request.handler()
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/addons/openerp/controllers/utils.py, line 112, in 
wrapper
  return fn(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/addons/openerp/controllers/listgrid.py, line 285, in 
get
  wid = frm.screen.get_widgets_by_name(source, kind=listgrid.List)[0]
  IndexError: list index out of range

  
  /usr/lib/python2.6/cgitb.py:173: DeprecationWarning: BaseException.message 
has been deprecated as of Python 2.6
value = pydoc.html.repr(getattr(evalue, name))

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-temporal-db-branch-ksa into lp:~openerp-dev/openobject-addons/trunk-temporal-db

[Kirti Savalia(OpenERP)]

Kirti Savalia(OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-temporal-db-branch-ksa into 
lp:~openerp-dev/openobject-addons/trunk-temporal-db.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-temporal-db-branch-ksa/+merge/62871

Base Temporal Moudule with all method ( create, write, search, read, unlink and 
timeline function) and YML.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-temporal-db-branch-ksa/+merge/62871
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-temporal-db.
=== added directory 'base_temporal'
=== added file 'base_temporal/__init__.py'
--- base_temporal/__init__.py	1970-01-01 00:00:00 +
+++ base_temporal/__init__.py	2011-05-30 12:12:31 +
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##
+#
+#OpenERP, Open Source Management Solution
+#Copyright (C) 2004-2009 Tiny SPRL (http://tiny.be).
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as
+#published by the Free Software Foundation, either version 3 of the
+#License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU Affero General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program.  If not, see http://www.gnu.org/licenses/.
+#
+##
+import base_temporal
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_temporal/__openerp__.py'
--- base_temporal/__openerp__.py	1970-01-01 00:00:00 +
+++ base_temporal/__openerp__.py	2011-05-30 12:12:31 +
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##
+#
+#OpenERP, Open Source Management Solution
+#Copyright (C) 2004-2009 Tiny SPRL (http://tiny.be).
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as
+#published by the Free Software Foundation, either version 3 of the
+#License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU Affero General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program.  If not, see http://www.gnu.org/licenses/.
+#
+##
+
+{
+'name': 'Base Temporal',
+'version': '1.0',
+'description': 
+This module provides to be able to find the original record of an historization record.
+,
+'author': 'OpenERP SA',
+'website': 'http://openerp.com',
+'depends': ['base'],
+'init_xml': [],
+'update_xml': ['base_temporal_view.xml','security/ir.model.access.csv'],
+ 'test': [
+  'test/base_temporal_test.yml'
+ ],
+'installable': True,
+'active': False,
+'certificate' : '00475023941677743389',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_temporal/base_temporal.py'
--- base_temporal/base_temporal.py	1970-01-01 00:00:00 +
+++ base_temporal/base_temporal.py	2011-05-30 12:12:31 +
@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*-
+##
+#
+#OpenERP, Open Source Management Solution
+#Copyright (C) 2004-2009 Tiny SPRL (http://tiny.be).
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as
+#published by the Free Software Foundation, either version 3 of the
+#License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU Affero General Public License for more details.
+#
+#You should have received a copy of the GNU Affero General Public License
+#along with this program.  If not, see http://www.gnu.org/licenses/.
+#
+##
+from osv import fields, osv
+import time
+
+class 

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa into lp:openobject-server

[Naresh(OpenERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-723662-ysa/+merge/62862
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-server/trunk-bug-723662-ysa.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-configuration-rework-holidays-imprv-aag into lp:~openerp-dev/openobject-addons/trunk-configuration-rework

[Atik Agewan(OpenERP)]

Atik Agewan(OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-holidays-imprv-aag 
into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-holidays-imprv-aag/+merge/62872


Hello 

 Hr_holidays,hr : Rename saprator position into job information and inherit 
remaining legal leaves 
 field to hr.employee form'

Thanks
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-holidays-imprv-aag/+merge/62872
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2011-04-20 12:34:21 +
+++ hr/hr_view.xml	2011-05-30 12:18:26 +
@@ -63,7 +63,7 @@
 field name=work_location/
 /group
 group col=2 colspan=2
-separator string=Position colspan=2/
+separator string=Job Information colspan=2/
 field name=job_id domain=[('state','!=','old')]/
 field name=coach_id /
 /group

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-05-27 11:39:19 +
+++ hr_holidays/hr_holidays_view.xml	2011-05-30 12:18:26 +
@@ -470,6 +470,20 @@
field name=typenormal/field
field name=stateskip/field
/record
+   
+!-- Hr employee inherit Legal Leaves --
+
+record id=view_employee_form_leave_inherit model=ir.ui.view
+field name=namehr.employee.leave.form.inherit/field
+field name=modelhr.employee/field
+field name=typeform/field
+field name=inherit_id ref=hr.view_employee_form/
+field name=arch type=xml
+field name=coach_id position=after
+field name=remaining_leaves string=Remaining Legal Leaves/
+/field
+/field
+/record
 
 /data
 /openerp

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Bug 768106] Re: Got an error When one2many or many2many inside a one2many wizard

[Amit Parik (OpenERP)]

Hello Anoop,

This bug not has been fixed.

But Currently it is just assigned to web-client RD team the issue is
confirm so it will be solved as soon as possible.

Thanks for understanding!

-- 
You received this bug notification because you are a member of OpenERP
SA's Web Client RD, which is a bug assignee.
https://bugs.launchpad.net/bugs/768106

Title:
  Got an error When one2many or many2many inside a one2many wizard

Status in OpenERP Web Client:
  Confirmed

Bug description:
  Got an error When one2many or many2many inside a one2many wizard .When
  select data into the many2many , i got the below error .

  
The above is a description of an error in a Python program.  Here is
  the original traceback:

  Traceback (most recent call last):
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cprequest.py,
 line 606, in respond
  cherrypy.response.body = self.handler()
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/controllers/_root.py, line 87, in default
  return request.handler()
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/addons/openerp/controllers/utils.py, line 112, in 
wrapper
  return fn(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/addons/openerp/controllers/listgrid.py, line 285, in 
get
  wid = frm.screen.get_widgets_by_name(source, kind=listgrid.List)[0]
  IndexError: list index out of range

  
  /usr/lib/python2.6/cgitb.py:173: DeprecationWarning: BaseException.message 
has been deprecated as of Python 2.6
value = pydoc.html.repr(getattr(evalue, name))

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Bug 768106] Re: Got an error When one2many or many2many inside a one2many wizard

[anoop]

Hi
Thanks for reply. I am waiting for this solution .

regards
Anoop

On Mon, May 30, 2011 at 5:46 PM, Amit Parik (OpenERP)
a...@tinyerp.comwrote:

 Hello Anoop,

 This bug not has been fixed.

 But Currently it is just assigned to web-client RD team the issue is
 confirm so it will be solved as soon as possible.

 Thanks for understanding!

 --
 You received this bug notification because you are a direct subscriber
 of the bug.
 https://bugs.launchpad.net/bugs/768106

 Title:
  Got an error When one2many or many2many inside a one2many wizard

 Status in OpenERP Web Client:
   Confirmed

 Bug description:
  Got an error When one2many or many2many inside a one2many wizard .When
  select data into the many2many , i got the below error .


The above is a description of an error in a Python program.  Here is
  the original traceback:

  Traceback (most recent call last):
File
 /usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cprequest.py,
 line 606, in respond
  cherrypy.response.body = self.handler()
File
 /usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp
 6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in
 func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp
 6_0_2/openerp-web-6.0.2/openobject/controllers/_root.py, line 87, in
 default
  return request.handler()
File
 /usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp
 6_0_2/openerp-web-6.0.2/addons/openerp/controllers/utils.py, line 112, in
 wrapper
  return fn(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp
 6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in
 func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp
 6_0_2/openerp-web-6.0.2/addons/openerp/controllers/listgrid.py, line 285,
 in get
  wid = frm.screen.get_widgets_by_name(source, kind=listgrid.List)[0]
  IndexError: list index out of range


  /usr/lib/python2.6/cgitb.py:173: DeprecationWarning: BaseException.message
 has been deprecated as of Python 2.6
value = pydoc.html.repr(getattr(evalue, name))

 To unsubscribe from this bug, go to:
 https://bugs.launchpad.net/openobject-client-web/+bug/768106/+subscribe



-- 
regards,
Anoop

-- 
You received this bug notification because you are a member of OpenERP
SA's Web Client RD, which is a bug assignee.
https://bugs.launchpad.net/bugs/768106

Title:
  Got an error When one2many or many2many inside a one2many wizard

Status in OpenERP Web Client:
  Confirmed

Bug description:
  Got an error When one2many or many2many inside a one2many wizard .When
  select data into the many2many , i got the below error .

  
The above is a description of an error in a Python program.  Here is
  the original traceback:

  Traceback (most recent call last):
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cprequest.py,
 line 606, in respond
  cherrypy.response.body = self.handler()
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/controllers/_root.py, line 87, in default
  return request.handler()
File 
/usr/local/lib/python2.6/dist-packages/CherryPy-3.1.2-py2.6.egg/cherrypy/_cpdispatch.py,
 line 25, in __call__
  return self.callable(*self.args, **self.kwargs)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/addons/openerp/controllers/utils.py, line 112, in 
wrapper
  return fn(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/openobject/tools/_expose.py, line 182, in func_wrapper
  res = func(*args, **kw)
File /home/anoop/Desktop/openerp6 documents/openerp 
6_0_2/openerp-web-6.0.2/addons/openerp/controllers/listgrid.py, line 285, in 
get
  wid = frm.screen.get_widgets_by_name(source, kind=listgrid.List)[0]
  IndexError: list index out of range

  
  /usr/lib/python2.6/cgitb.py:173: DeprecationWarning: BaseException.message 
has been deprecated as of Python 2.6
value = pydoc.html.repr(getattr(evalue, name))

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-788686-psi into lp:openobject-addons

[Purnendu Singh (OpenERP)]

Purnendu Singh (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-788686-psi into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #788686 in OpenERP Addons: Problem with override function module: 
sale_layout
  https://bugs.launchpad.net/openobject-addons/+bug/788686

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-788686-psi/+merge/62875

Hello,

Fixes:
https://bugs.launchpad.net/openobject-addons/+bug/788686
 Problem with override function module: sale_layout

We need to override the field also to override any function which is being 
called by function field. (framework limitation).

Thanks
Purnendu Singh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-788686-psi/+merge/62875
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-788686-psi.
=== modified file 'sale_layout/sale_layout.py'
--- sale_layout/sale_layout.py	2011-01-14 00:11:01 +
+++ sale_layout/sale_layout.py	2011-05-30 12:53:31 +
@@ -116,6 +116,7 @@
 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
 'product_uom': fields.many2one('product.uom', 'Product UoM'),
+'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
 }
 
 _defaults = {

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-710689-ara into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-710689-ara 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-710689-ara/+merge/61937
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-710689-ara/+merge/61937
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-710689-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-784363-ron into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-784363-ron 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-784363-ron/+merge/61554
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-784363-ron/+merge/61554
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-784363-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-751411-mtr into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-751411-mtr 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-751411-mtr/+merge/61698
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-751411-mtr/+merge/61698
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-751411-mtr.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Bharat Devnani (Open ERP)]

Bharat Devnani (Open ERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde 
into lp:~openerp-dev/openobject-addons/trunk-account-asset.

Requested reviews:
  OpenERP RD Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde/+merge/62878

Hello sir,

I have added tooltip for Computation method, During (interval) and Time Method,

I have created groups for depreciation period and for dates,

changed the label name from Computation method to Computation Method, and 
corrected all indentations.

Thanks  Regards, 
Devnani Bharat R.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde/+merge/62878
Your team OpenERP RD Team is requested to review the proposed merge of 
lp:~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde 
into lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2011-05-27 14:50:49 +
+++ account_asset/account_asset.py	2011-05-30 13:26:25 +
@@ -174,13 +174,14 @@
 'active': fields.boolean('Active', select=2),
 'partner_id': fields.many2one('res.partner', 'Partner'),
 
-'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}),
+'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help=Linear: Calculated on basis of Gross Value/During (interval) \
+ \nProgressive: Calculated on basis of Gross Value * Progressif Factor),
+'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}, help=Calculates Depreciation within specified interval),
 'method_period': fields.integer('Depre. all (period)', readonly=True, states={'draft':[('readonly',False)]}),
 'method_end': fields.date('Ending date'),
 'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
 'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
-'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help=Delay: Allow users to enter number of periods to generate depreciation lines \n Ending Period: Calculates depreciation lines on the basis of every 12 months),
 'prorata':fields.boolean('Prorata Temporis', Readonly=True, help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
 'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
 'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True,),

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2011-05-27 13:49:30 +
+++ account_asset/account_asset_view.xml	2011-05-30 13:26:25 +
@@ -19,7 +19,7 @@
 separator string=Depreciation Dates colspan=2 /
 field name=method_time/
 field name=method_delay/
-field name=method_period attrs={'invisible':[('method_time','=','end')]}/
+field name=method_period attrs={'invisible':[('method_time','=','end')]}/
 /group
 group colspan=2 col=2
 separator string=Depreciation Method colspan=2 /
@@ -76,21 +76,31 @@
 separator string=Other Information colspan=4/
 field name=partner_id/
 field name=purchase_date/
-separator string=Depreciation duration colspan=4/
-button 
- name=%(wizard_asset_modify)d 
- states=open 
- string=Change duration 
- type=action 
+button
+ name=%(wizard_asset_modify)d
+ states=open
+ string=Change duration
+ type=action
  colspan=2/
 newline/
-field name=method/
-   

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

[Mustufa Rangwala (Open ERP)]

To be improve/fix.

1. on debit_line = we have not passed partner_id while create move line for 
it.. debit and credit should have the same code 
2. created move state with Unbalance now, we can post that move = we post, 
only if the boolean 'skip draft state for new entry is set on the selected 
journal of payslip'

thanks,
mra
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr/+merge/61090
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-payroll.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Ujjvala Collins (OpenERP)]

Review: Resubmit
Hello Sir,

I have corrected the problem. Please check.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco/+merge/61402
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-783994-ara into lp:openobject-addons

[qdp (OpenERP)]

Review: Needs Fixing
please put the _check_date constraint into the attribute _constraints of 
account.move.line.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-783994-ara/+merge/61545
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-783994-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Review: Needs Fixing
if i create the move for one depr line..and then press compute button depr. 
line get weired.

fix it.

thanks,
mra
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco/+merge/61402
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-772476-ara into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-772476-ara 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-772476-ara/+merge/61379
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-772476-ara/+merge/61379
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-772476-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-783837-ron into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-783837-ron 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-783837-ron/+merge/61250
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-783837-ron/+merge/61250
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-783837-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-782196-ara into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-782196-ara 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782196-ara/+merge/61240
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782196-ara/+merge/61240
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-782196-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-782163-ara into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-782163-ara 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782163-ara/+merge/61217
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-782163-ara/+merge/61217
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-782163-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-781656-ara into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-781656-ara 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-781656-ara/+merge/61093
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-781656-ara/+merge/61093
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-781656-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-689547-ara into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-689547-ara 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-689547-ara/+merge/61084
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-689547-ara/+merge/61084
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-689547-ara.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-764855-aag into lp:openobject-addons

[qdp (OpenERP)]

FYI: i fixed the icon too (terp-go-home)
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-764855-aag/+merge/58276
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-764855-aag.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-780668-ron into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-780668-ron 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-780668-ron/+merge/60603
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-780668-ron/+merge/60603
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-780668-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-778473-ron into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-778473-ron 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-778473-ron/+merge/60457
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-778473-ron/+merge/60457
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-778473-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-777121-rha into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-777121-rha 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-777121-rha/+merge/60356
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-777121-rha/+merge/60356
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-777121-rha.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-773128-ron into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-773128-ron 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-773128-ron/+merge/60165
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-773128-ron/+merge/60165
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-773128-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron into lp:openobject-addons

[qdp (OpenERP)]

Review: Needs Fixing
0 is an acceptable value
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-777803-ron/+merge/60147
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron into lp:openobject-addons

[qdp (OpenERP)]

i fixed
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-777803-ron/+merge/60147
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-777803-ron/+merge/60147
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-777803-ron/+merge/60147
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-hr-search-psi into lp:openobject-addons

[qdp (OpenERP)]

next time, create a LP bug and link it to the merge prop.

thanks
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr-search-psi/+merge/59777
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-hr-search-psi.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-hr-search-psi into lp:openobject-addons

[noreply]

The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-hr-search-psi 
into lp:openobject-addons has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr-search-psi/+merge/59777
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr-search-psi/+merge/59777
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-hr-search-psi.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlog8_correction-atp into lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm

[noreply]

The proposal to merge 
lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlog8_correction-atp 
into lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlog8_correction-atp/+merge/62864
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlog8_correction-atp/+merge/62864
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-765559-ron into lp:openobject-addons

[qdp (OpenERP)]

Review: Needs Fixing
i don't think you can change the order = parent_left, it's used for the 
hierarchy computation.. Need to check that
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-765559-ron/+merge/59498
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-765559-ron.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] History conversions for the 6.1 project

[Xavier Morel]

So the conversion is done, all the branches which were correctly converted got 
pushed to https://code.launchpad.net/openerp-web

I removed the 'trunk-proto61' prefixes as there isn't much point to them since 
there is no proto61 branch in the openerp-web project, and the only branch they 
could be  based on is trunk.

Three branches failed to convert (the ones which branched directly from trunk):
* trunk-proto61-dhtmlx-gantt-cpa (since it was just a merge from trunk, and the 
branch had been merged into trunk, that should not be a problem it can just be 
re-branched from trunk)
* trunk-proto61-filters-niv
* trunk-proto61-o2m-niv

Everything else seems to have converted correctly. YMMV.

I went and changed the converted proto61-* and trunk-proto61-* branches to 
abandonned (or merged for those which had been merged previously but had not 
seen any change in status) so they don't needlessly clutter the 
openobject-client-web branchspace.

That's pretty much it I think, you'll have to checkout the new branches but 
apart from that everything should be set for working.
___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll

[Purnendu Singh (OpenERP)]

The proposal to merge 
lp:~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr into 
lp:~openerp-dev/openobject-addons/trunk-payroll has been updated.

Status: Needs review = Work in progress

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr/+merge/61090
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-account-remove-fields-mtr/+merge/61090
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-payroll.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Ujjvala Collins (OpenERP)]

The proposal to merge 
lp:~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco 
into lp:~openerp-dev/openobject-addons/trunk-account-asset has been updated.

Status: Needs review = Work in progress

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco/+merge/61402
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-prorata_temporis_impl-uco/+merge/61402
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Bharat Devnani (Open ERP)]

Review: Resubmit
Hello Sir,

Merged from main branch.

Thanks  Regards,
Devnani Bharat R.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde/+merge/61209
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Bharat Devnani (Open ERP)]

The proposal to merge 
lp:~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde
 into lp:~openerp-dev/openobject-addons/trunk-account-asset has been updated.

Status: Needs review = Work in progress

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde/+merge/61209
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde/+merge/61209
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Review: Needs Fixing
I can not install the module.
 File parser.pxi, line 565, in lxml.etree._raiseParseError 
(src/lxml/lxml.etree.c:64088)
XMLSyntaxError: Opening and ending tag mismatch: field line 90 and group, line 
91, column 29
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-improve_usability-bde/+merge/62878
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

[Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Bharat Devnani (Open ERP)]

Bharat Devnani (Open ERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde
 into lp:~openerp-dev/openobject-addons/trunk-account-asset.

Requested reviews:
  Bharat Devnani (Open ERP) (bde-openerp)
  Mustufa Rangwala (Open ERP) (mra-tinyerp)
  qdp (OpenERP) (qdp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde/+merge/61209

Hello,

I have added the onchange functionality on asset account = fill the 
depreciation account

Thanks  Regards,
Bharat Devnani
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde/+merge/61209
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2011-05-27 14:50:49 +
+++ account_asset/account_asset.py	2011-05-31 05:03:35 +
@@ -56,6 +56,12 @@
 'method_progress_factor': 0.3,
 }
 
+def onchange_account_asset(self, cr, uid, ids, account_asset_id, context=None):
+res = {'value':{}}
+if account_asset_id:
+   res['value'] = {'account_depreciation_id': account_asset_id}
+return res
+
 account_asset_category()
 
 #class one2many_mod_asset(fields.one2many):
@@ -101,8 +107,8 @@
 
 def compute_depreciation_board(self, cr, uid,ids, context=None):
 depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
-for asset in self.browse(cr, uid, ids, context=context):
-old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '=', False)])
+for asset in self.browse(cr, uid, ids, context=context):  
+old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id),('move_id', '=', False)])
 if old_depreciation_line_ids:
 depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
 undone_dotation_number = asset.method_delay - len(asset.account_move_line_ids)
@@ -170,7 +176,7 @@
 'parent_id': fields.many2one('account.asset.asset', 'Parent Asset'),
 'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
 'purchase_date': fields.date('Purchase Date', required=True),
-'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'state', required=True),
+'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'State', required=True),
 'active': fields.boolean('Active', select=2),
 'partner_id': fields.many2one('res.partner', 'Partner'),
 

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2011-05-27 13:49:30 +
+++ account_asset/account_asset_view.xml	2011-05-31 05:03:35 +
@@ -12,7 +12,7 @@
 field name=company_id widget=selection groups=base.group_multi_company/
 separator string=Accounting information colspan=4 /
 field name=journal_id/
-field name=account_asset_id/
+field name=account_asset_id on_change=onchange_account_asset(account_asset_id)/
 field name=account_depreciation_id/
 field name=account_expense_depreciation_id/
 group colspan=2 col=2

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp

Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset

[Mustufa Rangwala (Open ERP)]

Review: Approve

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-onchange-asset-account-bde/+merge/61209
Your team OpenERP RD Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-account-asset.

___
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help   : https://help.launchpad.net/ListHelp