Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-717198-pso into lp:openobject-addons
Review: Resubmit Added new field for percentage, Improved create_analytic_lines and Improved function for amount currency -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-717198-pso/+merge/57623 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-717198-pso. ___ 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
Rohan Nayani(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-777803-ron into
lp:openobject-addons.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
Related bugs:
Bug #777803 in OpenERP Addons: [PS] Wrong result when updating the stock
level to a negative value
https://bugs.launchpad.net/openobject-addons/+bug/777803
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-777803-ron/+merge/60147
entering a negative value in the stock level when click on update button on
product form
--
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.
=== modified file 'stock/wizard/stock_change_product_qty.py'
--- stock/wizard/stock_change_product_qty.py 2011-03-03 13:27:14 +
+++ stock/wizard/stock_change_product_qty.py 2011-05-06 06:08:28 +
@@ -85,6 +85,8 @@
res_original = prod_obj_pool.browse(cr, uid, rec_id, context=context)
for data in self.browse(cr, uid, ids, context=context):
+if data.new_quantity = 0:
+raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: %s') % tools.ustr(res_original.name)}, context=context)
line_data ={
'inventory_id' : inventory_id,
___
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/contact_training_duplicate_course into lp:~openobject-training/openobject-addons/training
gpa(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/contact_training_duplicate_course into
lp:~openobject-training/openobject-addons/training.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/contact_training_duplicate_course/+merge/60148
Fixed the duplication of the course in the contact courses tab when more than
one course for contact
--
https://code.launchpad.net/~openerp-dev/openobject-addons/contact_training_duplicate_course/+merge/60148
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-addons/contact_training_duplicate_course.
=== modified file 'training/training.py'
--- training/training.py 2011-05-02 04:49:56 +
+++ training/training.py 2011-05-06 06:18:28 +
@@ -3928,6 +3928,22 @@
values['reference'] = self.pool.get('ir.sequence').get(cr, uid, 'training.pshr')
return super(training_participation_stakeholder_request, self).create(cr, uid, values, context)
+def copy(self, cr, uid, id, default=None, context=None):
+if context is None:
+context={}
+
+if not default:
+default = {}
+default = default.copy()
+default.update({
+'reference': '/',
+'purchase_order_id': False,
+'participation_ids' : [],
+})
+return super(training_participation_stakeholder_request, self).copy(cr, uid, id, default=default,
+context=context)
+
+
def on_change_job(self, cr, uid, ids, job_id, context=None):
if not job_id:
return False
@@ -4423,9 +4439,11 @@
def init(self, cr):
tools.drop_view_if_exists(cr, 'training_contact_course')
cr.execute(CREATE OR REPLACE VIEW training_contact_course as (
- SELECT job.id, job.function, rel.course_id, rel.job_id, job.contact_id
- FROM training_course_job_rel rel, (SELECT id, contact_id, function FROM res_partner_job) AS job
- WHERE job.id = rel.job_id ))
+ SELECT course.id as id, course.id AS course_id, contact.id AS contact_id, job.function AS function
+ FROM training_course course, training_course_job_rel rel, res_partner_job job, res_partner_contact contact
+ WHERE job.id = rel.job_id
+ AND course.id = rel.course_id
+ AND contact.id = job.contact_id ))
training_contact_course()
___
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-744789-qdp into lp:openobject-addons
Review: Resubmit Hello sir, I have added Unreconciled Entries as fourth filter option and set Initial balance check box readonly while filter = Unreconciled Entries, And For the YML traceback as we are getting this due to the general ledger report(Not b'coz of Partner ledger) i will soon place a merge proposal for that into a separate branch. Thanks and regards, Purnendu Singh -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-744789-qdp/+merge/58334 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-744789-qdp. ___ 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-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll
Review: Resubmit i have improve little code and commited in the branch. Note: we have not create worked_days object with python code so for now we can not test worked_days.sum() .. But function seems ok so it will work :) Thanks, mra -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr/+merge/60055 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-payslip-on-payslip-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll
Review: Approve -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-payslip-on-payslip-mtr/+merge/60055 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-bug-744789-qdp into lp:openobject-addons
Review: Needs Fixing conflicts in the branch. please resolve it. -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-744789-qdp/+merge/58334 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-744789-qdp. ___ 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
Review: Approve -- 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-744789-qdp into lp:openobject-addons
conflicts in the branch. please resolve it. Hello sir, Conflicts are due to the changes in main addons branch(lp:openobject-addons). Can you please merge main branch to this branch to remove these conflicts. Thanks, Purnendu Singh -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-744789-qdp/+merge/58334 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-744789-qdp. ___ 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-backlog3.1_corrections-atp into lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm
The proposal to merge lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlog3.1_corrections-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-backlog3.1_corrections-atp/+merge/59324 -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlog3.1_corrections-atp/+merge/59324 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-import_sugarcrm-backlog3.1_corrections-atp into lp:~openerp-dev/openobject-addons/trunk-import_sugarcrm
has been merged in lp:~openerp-dev/openobject-addons/trunk-import-sugarcrm-factoring-tfr -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_sugarcrm-backlog3.1_corrections-atp/+merge/59324 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-744789-qdp into lp:openobject-addons
Review: Resubmit Hello, I have merged the main addons branch with this branch to resolve conflicts. Thanks Purnendu Singh -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-744789-qdp/+merge/58334 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-744789-qdp. ___ 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-client/trunk-bug-secure_password-rgo into lp:openobject-client
Ravi Gohil (Open ERP) has proposed merging
lp:~openerp-dev/openobject-client/trunk-bug-secure_password-rgo into
lp:openobject-client.
Requested reviews:
OpenERP sa GTK client RD (openerp-dev-gtk)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-secure_password-rgo/+merge/60161
--
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-secure_password-rgo/+merge/60161
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-client/trunk-bug-secure_password-rgo.
=== modified file 'bin/widget/view/form_gtk/interface.py'
--- bin/widget/view/form_gtk/interface.py 2011-04-20 09:31:42 +
+++ bin/widget/view/form_gtk/interface.py 2011-05-06 09:52:28 +
@@ -86,16 +86,19 @@
def _menu_sig_default_set(self):
deps = []
+ispwdfield = False
wid = self._view.view_form.widgets
for wname, wview in self._view.view_form.widgets.items():
if wview.modelfield.attrs.get('change_default', False):
value = wview.modelfield.get(self._view.model)
deps.append((wname, wname, value, value))
+if self._view.widget_name == new_password:
+ispwdfield = True
value = self._view.modelfield.get_default(self._view.model)
model = self._view.modelfield.parent.resource
wid_common.field_pref_set(self._view.widget_name,
self.attrs.get('string', self._view.widget_name), model,
-value, deps, window=self._window)
+value, ispwdfield, deps, window=self._window)
def _menu_open(self, obj, menu):
item = gtk.SeparatorMenuItem()
=== modified file 'bin/widget/view/form_gtk/wid_common.py'
--- bin/widget/view/form_gtk/wid_common.py 2010-01-12 09:24:17 +
+++ bin/widget/view/form_gtk/wid_common.py 2011-05-06 09:52:28 +
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##
-#
+#
#OpenERP, Open Source Management Solution
#Copyright (C) 2004-2010 Tiny SPRL (http://tiny.be).
#
@@ -15,7 +15,7 @@
#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/.
+#along with this program. If not, see http://www.gnu.org/licenses/.
#
##
@@ -27,7 +27,7 @@
import service
import rpc
-def field_pref_set(field, name, model, value, dependance=None, window=None):
+def field_pref_set(field, name, model, value, pwdfield, dependance=None, window=None):
win_gl = glade.XML(common.terp_path('openerp.glade'), 'win_field_pref',
gettext.textdomain())
if dependance is None:
@@ -43,7 +43,8 @@
ent.set_text(model)
ent = win_gl.get_widget('ent_value')
ent.set_text((value and str(value)) or '/')
-
+if pwdfield == True:
+ent.set_visibility(False)
radio = win_gl.get_widget('radio_user_pref')
vbox = win_gl.get_widget('pref_vbox')
@@ -75,3 +76,4 @@
+
___
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/6.0-opw_bug-734191-ach into lp:openobject-addons/6.0
Review: Disapprove I don't think it will work. If you have 'variant' in the context (line 639), it's calling only create and never calling copy_translations. The minor other things Olivier told you are still remaining: - why the funky indentation in copy_translation()? ;-) - as a good practice, do not alter the original context, please use a copy, otherwise you might create side-effects when you modify/remove the language, for example if the RPC call does something else afterwards. 630 context_without_lang = context.copy() 631 if 'lang' in context_without_lang: 632 del context_without_lang['lang'] 633 product = self.read(cr, uid, id, ['name'], context=context_without_lang) 651 return super(product_product, self).copy(cr, uid, id, default=default, 652 context=context) -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw_bug-734191-ach/+merge/56116 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw_bug-734191-ach. ___ 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-client/trunk-bug-secure_password-rgo into lp:openobject-client
Review: Needs Fixing
Hello
You should not fix the problem for a specific field whose name is something
like password see line no:14 in the diff.
what you need to do is :
1: you need to check the self.attrs dict of the field for the attribute
password
2: no need to declare the varible, just pass the argument in the
wid_common.field_pref_set
like self.attrs.get('password',False)
3:then finally in wid_common ent.set_visibility(variable you store the value)
That's All !
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-secure_password-rgo/+merge/60161
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-client/trunk-bug-secure_password-rgo.
___
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/content_review_error_fix into lp:~openobject-training/openobject-addons/training
gpa(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/content_review_error_fix into
lp:~openobject-training/openobject-addons/training.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/content_review_error_fix/+merge/60163
Fixed the IntegrityError for content review when create invoice without partner
and invoice
--
https://code.launchpad.net/~openerp-dev/openobject-addons/content_review_error_fix/+merge/60163
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-addons/content_review_error_fix.
=== modified file 'training/training_content_review.py'
--- training/training_content_review.py 2011-04-07 11:11:57 +
+++ training/training_content_review.py 2011-05-06 10:15:54 +
@@ -147,6 +147,9 @@
if review.invoice_id:
# refuse to create another invoice is one is currently set
continue
+if not review.partner_id or not review.address_id:
+raise osv.except_osv(_('Error !'),_(Can you please check Partner and Address assign before create invoice))
+
inv_vals = inv_pool.default_get(cr, uid,
['type', 'currency_id', 'journal_id', 'company_id'],
{'type': 'in_invoice'})
___
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/content_review_error_fix into lp:~openobject-training/openobject-addons/training
The proposal to merge lp:~openerp-dev/openobject-addons/content_review_error_fix into lp:~openobject-training/openobject-addons/training has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/content_review_error_fix/+merge/60163 -- https://code.launchpad.net/~openerp-dev/openobject-addons/content_review_error_fix/+merge/60163 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/content_review_error_fix. ___ 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_timesheet_fix_yml-ara into lp:openobject-addons
Review: Approve seems working now -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara/+merge/59775 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-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-748178-pso into lp:openobject-addons
Hello Quentin, As the average price field has group_operator = avg so in group by environment that field value will be totaled / the no of lines in that group which will result in a wrong value. because that field already has the average value. so it shows sum(average_value) / no of lines. now if we remove the group_operator then by default it show the sum of the two lines which is also incorrect. So If you want, can I add that price_average field in invoice analysis view ? -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-748178-pso/+merge/57449 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-748178-pso. ___ 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-client/trunk-bug-secure_password-rgo into lp:openobject-client
Ravi Gohil (Open ERP) has proposed merging
lp:~openerp-dev/openobject-client/trunk-bug-secure_password-rgo into
lp:openobject-client.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-secure_password-rgo/+merge/60167
--
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-secure_password-rgo/+merge/60167
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-client/trunk-bug-secure_password-rgo.
=== modified file 'bin/widget/view/form_gtk/interface.py'
--- bin/widget/view/form_gtk/interface.py 2011-04-20 09:31:42 +
+++ bin/widget/view/form_gtk/interface.py 2011-05-06 10:58:32 +
@@ -95,7 +95,7 @@
model = self._view.modelfield.parent.resource
wid_common.field_pref_set(self._view.widget_name,
self.attrs.get('string', self._view.widget_name), model,
-value, deps, window=self._window)
+value, self.attrs.get('password', False), deps, window=self._window)
def _menu_open(self, obj, menu):
item = gtk.SeparatorMenuItem()
=== modified file 'bin/widget/view/form_gtk/wid_common.py'
--- bin/widget/view/form_gtk/wid_common.py 2010-01-12 09:24:17 +
+++ bin/widget/view/form_gtk/wid_common.py 2011-05-06 10:58:32 +
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##
-#
+#
#OpenERP, Open Source Management Solution
#Copyright (C) 2004-2010 Tiny SPRL (http://tiny.be).
#
@@ -15,7 +15,7 @@
#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/.
+#along with this program. If not, see http://www.gnu.org/licenses/.
#
##
@@ -27,7 +27,7 @@
import service
import rpc
-def field_pref_set(field, name, model, value, dependance=None, window=None):
+def field_pref_set(field, name, model, value, pwdfield, dependance=None, window=None):
win_gl = glade.XML(common.terp_path('openerp.glade'), 'win_field_pref',
gettext.textdomain())
if dependance is None:
@@ -43,7 +43,7 @@
ent.set_text(model)
ent = win_gl.get_widget('ent_value')
ent.set_text((value and str(value)) or '/')
-
+ent.set_visibility(not pwdfield)
radio = win_gl.get_widget('radio_user_pref')
vbox = win_gl.get_widget('pref_vbox')
@@ -75,3 +75,4 @@
+
___
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_timesheet_fix_yml-ara into lp:openobject-addons
Hello Sir, [Fix] : I have fixed yaml to make dynamic dates for new timesheet and removed hardcoding. Thanks skh -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara/+merge/59775 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-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-hr_timesheet_fix_yml-ara into lp:openobject-addons
The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-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-hr_timesheet_fix_yml-ara/+merge/59775 -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara/+merge/59775 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-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-748178-pso into lp:openobject-addons
why did you removed average_price from view? -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-748178-pso/+merge/57449 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-748178-pso. ___ 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-748178-pso into lp:openobject-addons
The proposal to merge lp:~openerp-dev/openobject-addons/trunk-bug-748178-pso 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-748178-pso/+merge/57449 -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-748178-pso/+merge/57449 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-748178-pso. ___ 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-client/trunk-bug-secure_password-rgo into lp:openobject-client
The proposal to merge lp:~openerp-dev/openobject-client/trunk-bug-secure_password-rgo into lp:openobject-client has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-secure_password-rgo/+merge/60167 -- https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-secure_password-rgo/+merge/60167 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-client/trunk-bug-secure_password-rgo. ___ 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 777908] Re: [PS] Only the first (creator) administrator has the editing right
** Project changed: openobject-addons = openobject-client-web ** Changed in: openobject-client-web Assignee: OpenERP Web Administrators (openobject-web-admins) = OpenERP SA's Web Client RD (openerp-dev-web) -- 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/777908 Title: [PS] Only the first (creator) administrator has the editing right Status in OpenERP Web Client: Confirmed Bug description: web client, revno 3391 * Creating a new database, the system automatically creates an administrator * Create a new user User and assign him the administration rights * Takes the existing administrator user and remove the administration groups from his rights * Try to edit a view in the web client using the user User Obtained result : the user User cannot edit view, only the first created user Administrator can Expected result : the new administrator User can edit view, not the older one Administrator Remark : The editing of views depends on the id (=1) of the user reported by dha, OpenERP Prof. Serv ___ 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-748178-pso into lp:openobject-addons
Review: Approve i remember the problem, :-) it's cool like this -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-748178-pso/+merge/57449 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-748178-pso. ___ 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-5583-ach into lp:openobject-addons/6.0
Anup(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-5583-ach into
lp:openobject-addons/6.0.
Requested reviews:
Jay Vora (OpenERP) (jvo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5583-ach/+merge/60171
Hello,
There is a problem with the Profit Report. Just Change the language, Say
French and you'll see that the string 'Net Profit' is not being displayed in
the report.
I have found a solution for the same.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5583-ach/+merge/60171
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-5583-ach.
=== modified file 'account/report/account_profit_horizontal.rml'
--- account/report/account_profit_horizontal.rml 2011-01-14 00:11:01 +
+++ account/report/account_profit_horizontal.rml 2011-05-06 11:55:48 +
@@ -244,19 +244,19 @@
para style=terp_default_Bold_9/para
/td
td
- para style=terp_default_Bold_9[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]]/para
+ para style=terp_default_Bold_9[[ final_result()['type'] == get_trans('Net Profit') and final_result()['type'] or '' ]]/para
/td
td
- para style=terp_default_Right_9_Bold[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]/para
+ para style=terp_default_Right_9_Bold[[ final_result()['balance'] and final_result()['type'] == get_trans('Net Profit') and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]/para
/td
td
para style=terp_default_Bold_9/para
/td
td
- para style=terp_default_Bold_9[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]]/para
+ para style=terp_default_Bold_9[[ final_result()['type'] == get_trans('Net Loss') and final_result()['type'] or '' ]]/para
/td
td
- para style=terp_default_Right_9_Bold[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]/para
+ para style=terp_default_Right_9_Bold[[ final_result()['balance'] and final_result()['type'] == get_trans('Net Loss') and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == get_trans('Net Loss') and company.currency_id.symbol ]]/para
/td
/tr
/blockTable
=== modified file 'account/report/account_profit_loss.py'
--- account/report/account_profit_loss.py 2011-04-05 08:52:20 +
+++ account/report/account_profit_loss.py 2011-05-06 11:55:48 +
@@ -53,6 +53,7 @@
'get_end_date':self._get_end_date,
'get_company':self._get_company,
'get_target_move': self._get_target_move,
+'get_trans':self._get_trans
})
self.context = context
@@ -77,6 +78,9 @@
self.result_sum_cr += self.res_pl['balance']
return self.result_sum_cr
+def _get_trans(self, source):
+return _(source)
+
def get_data(self, data):
cr, uid = self.cr, self.uid
db_pool = pooler.get_pool(self.cr.dbname)
=== modified file 'account/report/account_profit_loss.rml'
--- account/report/account_profit_loss.rml 2011-01-14 00:11:01 +
+++ account/report/account_profit_loss.rml 2011-05-06 11:55:48 +
@@ -228,10 +228,10 @@
para style=terp_default_Bold_9/para
/td
td
- para style=terp_default_Bold_9[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]/para
+ para style=terp_default_Bold_9[[ final_result()['type'] == get_trans('Net Profit') and final_result()['type'] or removeParentNode('blockTable') ]]/para
/td
td
- para style=terp_default_Right_9_Bold[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]/para
+ para style=terp_default_Right_9_Bold[[ final_result()['balance'] and final_result()['type'] == get_trans('Net Profit') and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == get_trans('Net Profit') and company.currency_id.symbol ]]/para
/td
/tr
/blockTable
@@ -283,10 +283,10 @@
para style=terp_default_Bold_9/para
/td
td
- para style=terp_default_Bold_9[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]/para
+ para
Re: [Openerp-dev-web] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara into lp:openobject-addons
Review: Needs Fixing
Hello Somesh,
Kindly check the following notes:
1. Line 60 of your merge, hour + 3 would break the test when it runs after
10-00.
2. Line 22. I am not 100% sure, but It is advisable to create a user rather
than linking an existing one.
3. Line 51 :Optimize the code by calling time.strftime('%Y-%m-%d %H:%M:%S'). It
will give you the same result.
4. Line 37-39. We may need date_to and we can achieve it by following
expression:
(datetime.now()+timedelta(X)).strftime('%Y-%m-%d') where X is the no. of days
for which you test the sheet.
5. About Line 9 : Won't it be fine to call specific fields to read rather than
[] on line 49 of yml?
data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid,
[ref(hr_timesheet_invoice_create_0)], [FIELDS], context)[0]
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-ara/+merge/59775
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-hr_timesheet_fix_yml-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] [Bug 772451] Re: [6.0.2 rev 4591/4592] TypeError: 'int' object is unsubscriptable
** Project changed: openobject-client-web = openobject-addons ** Changed in: openobject-addons Assignee: OpenERP SA's Web Client RD (openerp-dev-web) = (unassigned) ** Changed in: openobject-addons Assignee: (unassigned) = OpenERP Publisher's Warranty Team (openerp-opw) -- 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/772451 Title: [6.0.2 rev 4591/4592] TypeError: 'int' object is unsubscriptable Status in OpenERP Modules (addons): Confirmed Bug description: Hey all bzr revision 4591/4592 How to reproduce: Accounting / Journal Entries / Journal Entries . Create new Journal Entry . Create new Journal Item: Enter Name, Account, Debit and press Enter . Error: Traceback (most recent call last): File /opt/openerp/development/server/bin/netsvc.py, line 489, in dispatch result = ExportService.getService(service_name).dispatch(method, auth, params) File /opt/openerp/development/server/bin/service/web_services.py, line 599, in dispatch res = fn(db, uid, *params) File /opt/openerp/development/server/bin/osv/osv.py, line 122, in wrapper return f(self, dbname, *args, **kwargs) File /opt/openerp/development/server/bin/osv/osv.py, line 176, in execute res = self.execute_cr(cr, uid, obj, method, *args, **kw) File /opt/openerp/development/server/bin/osv/osv.py, line 167, in execute_cr return getattr(object, method)(cr, uid, *args, **kw) File /opt/openerp/development/server/bin/addons/account/account_move_line.py, line 158, in default_get data = self._default_get(cr, uid, fields, context=context) File /opt/openerp/development/server/bin/addons/account/account_move_line.py, line 230, in _default_get if i[2]: TypeError: 'int' object is unsubscriptable . Close Error message . Click into Reference field of the new journal Item and press ESC . Journal Item will be generated . Click on new (Journal Item) same error comes up After first error message Loading bar on top stays open regards thomi ___ 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-5577-jap into lp:openobject-addons/6.0
Jagdish Panchal (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap into
lp:openobject-addons/6.0.
Requested reviews:
Jay Vora (OpenERP) (jvo-openerp)
Related bugs:
Bug #767058 in OpenERP Addons: invoice payment should pay only the invoice I
started from
https://bugs.launchpad.net/openobject-addons/+bug/767058
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181
Hello,
This fixes the bug 767058.
When you pay invoice in the voucher dedicated invoice should only be
displayed to be paid.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap.
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py 2011-01-17 11:20:56 +
+++ account_voucher/account_voucher.py 2011-05-06 13:21:21 +
@@ -460,7 +460,10 @@
account_type = 'receivable'
if not context.get('move_line_ids', False):
-ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
+domain = [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)]
+if context.get('invoice_id', False):
+ domain.append(('invoice', '=', context['invoice_id']))
+ ids = move_line_pool.search(cr, uid, domain, context=context)
else:
ids = context['move_line_ids']
ids.reverse()
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2011-03-01 11:49:27 +
+++ account_voucher/voucher_payment_receipt_view.xml 2011-05-06 13:21:21 +
@@ -88,12 +88,12 @@
field name=arch type=xml
form string=Bill Payment
group col=6 colspan=4
-field name=partner_id required=1 on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date) context={'invoice_currency':currency_id} string=Supplier/
-field name=amount on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)/
+field name=partner_id required=1 on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context) context={'invoice_currency':currency_id} string=Supplier/
+field name=amount on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)/
field name=journal_id
domain=[('type','in',['bank', 'cash'])]
widget=selection select=1
-on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)
+on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)
string=Payment Method/
field name=date select=1 on_change=onchange_date(partner_id, journal_id, amount, currency_id, type, date)/
field name=reference select=1 string=Payment Ref/
@@ -151,12 +151,12 @@
field name=arch type=xml
form string=Bill Payment
group col=6 colspan=4
-field name=partner_id domain=[('supplier','=',True)] required=1 on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date) context={'invoice_currency':currency_id} string=Supplier/
-field name=amount on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)/
+field name=partner_id domain=[('supplier','=',True)] required=1 on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context) context={'invoice_currency':currency_id} string=Supplier/
+field name=amount on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)/
field name=journal_id
domain=[('type','in',['bank', 'cash'])]
widget=selection select=1
-on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)
+on_change=onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)
string=Payment Method/
field name=date select=1 on_change=onchange_date(partner_id, journal_id, amount, currency_id, type, date)/
field name=reference
[Openerp-dev-web] [Bug 704626] Re: [6.0] Survey is not working in web client with development environment
you may want to have a look into http://bazaar.launchpad.net/~c2c/+junk/c2c_austria_dev/files/head:/crm_profile_c2c/ This modules adds * ordering the questions * allow to restart wizard with unanswered questions -- 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/704626 Title: [6.0] Survey is not working in web client with development environment Status in OpenERP Web Client: Confirmed Bug description: When the web client is using development environment in doc/openerp- web.cfg, the surveys answer views are broken. Go to Tools Survey Answer a Survey. Select a survey and try to answer it, it display a wrong window with just one field while the gtk client displays the good view. ___ 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-776983-ron into lp:openobject-addons
Review: Needs Fixing 1) combine to for loops into one for id in ids: for line in self.browse(cr, uid, ids, context=context): 2) use for record in line.order_line: only if line is shipped, otherwise it will loop useless for all purchase lines -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-776983-ron/+merge/60140 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-776983-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/6.0-opw-5577-jap into lp:openobject-addons/6.0
Your code is wrong, could you recheck it, there is an error with the move_line.Search method. Regards, On 05/06/2011 03:22 PM, Jagdish Panchal (Open ERP) wrote: Jagdish Panchal (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap into lp:openobject-addons/6.0. Requested reviews: Jay Vora (OpenERP) (jvo-openerp) Related bugs: Bug #767058 in OpenERP Addons: invoice payment should pay only the invoice I started from https://bugs.launchpad.net/openobject-addons/+bug/767058 For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181 Hello, This fixes the bug 767058. When you pay invoice in the voucher dedicated invoice should only be displayed to be paid. Thanks. -- Stephane Wirtel - As OpenERP is OpenSource, please feel free to contribute. Maintenance / Support Manager Release Manager Technical Project Manager OpenERP S.A. Chaussee de Namur, 40 B-1367 Grand-Rosière Tel: +32.81.81.37.00 Web: http://www.openerp.com Planet: http://www.openerp.com/planet/ Blog: http://stephane-wirtel-at-tiny.blogspot.com https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap. ___ 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/6.0-opw-5267-project_mrp-ach into lp:openobject-addons/6.0
Review: Approve -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach/+merge/59732 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach. ___ 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-5267-project_mrp-ach into lp:openobject-addons/6.0
The proposal to merge lp:~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach 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-5267-project_mrp-ach/+merge/59732 -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach/+merge/59732 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach. ___ 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/6.0-opw-5267-project_mrp-ach into lp:openobject-addons/6.0
Review: Approve Thanks Christophe and Anup, I corrected a little by removing 'state': 'draft' from the dictionary which creates the task. -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach/+merge/59732 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach. ___ 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-5267-project_mrp-ach into lp:openobject-addons/6.0
The proposal to merge lp:~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach 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-5267-project_mrp-ach/+merge/59732 -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach/+merge/59732 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5267-project_mrp-ach. ___ 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/6.0-opw-5577-jap into lp:openobject-addons/6.0
Review: Needs Fixing Jagidsh, Stephane is right, you need to shift line 12 to left. Thanks. -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap. ___ 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-5577-jap into lp:openobject-addons/6.0
The proposal to merge lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap into lp:openobject-addons/6.0 has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181 -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5577-jap/+merge/60181 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5577-jap. ___ 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-5582-jvo into lp:openobject-addons/6.0
Jay Vora (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-5582-jvo into
lp:openobject-addons/6.0.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #772451 in OpenERP Addons: [6.0.2 rev 4591/4592] TypeError: 'int' object
is unsubscriptable
https://bugs.launchpad.net/openobject-addons/+bug/772451
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5582-jvo/+merge/60203
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5582-jvo/+merge/60203
Your team OpenERP RD Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-5582-jvo.
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2011-01-20 14:02:14 +
+++ account/account_move_line.py 2011-05-06 15:23:24 +
@@ -226,11 +226,14 @@
# Starts: Manual entry from account.move form
if context.get('lines',[]):
total_new = 0.00
-for i in context['lines']:
-if i[2]:
-total_new += (i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
-for item in i[2]:
-data[item] = i[2][item]
+for line_record in context['lines']:
+if not isinstance(line_record, (tuple, list)):
+line_record_detail = self.read(cr, uid, line_record, ['analytic_account_id','debit','credit','name','reconcile_id','tax_code_id','tax_amount','account_id','ref','currency_id','date_maturity','amount_currency','partner_id', 'reconcile_partial_id'])
+else:
+line_record_detail = line_record[2]
+total_new += (line_record_detail['debit'] or 0.00)- (line_record_detail['credit'] or 0.00)
+for item in line_record_detail.keys():
+data[item] = line_record_detail[item]
if context['journal']:
journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
if journal_data.type == 'purchase':
___
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-5582-jvo into lp:openobject-addons/6.0
The proposal to merge lp:~openerp-dev/openobject-addons/6.0-opw-5582-jvo into lp:openobject-addons/6.0 has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5582-jvo/+merge/60203 -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5582-jvo/+merge/60203 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5582-jvo. ___ 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-bug-741457-dhs into lp:openobject-addons/6.0
The proposal to merge lp:~openerp-dev/openobject-addons/6.0-bug-741457-dhs into lp:openobject-addons/6.0 has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-741457-dhs/+merge/59746 -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-741457-dhs/+merge/59746 Your team OpenERP RD Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-bug-741457-dhs. ___ 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
