avanzosc team mailing list archive
-
avanzosc team
-
Mailing list archive
-
Message #00406
[Merge] lp:~xclude/avanzosc/mrp-6.1-Fix into lp:avanzosc/mrp-6.1
Daniel Stenlöv (XCLUDE) has proposed merging lp:~xclude/avanzosc/mrp-6.1-Fix into lp:avanzosc/mrp-6.1.
Requested reviews:
Avanzosc Manufacturing team (avanzosc-manufactuaring-team)
For more details, see:
https://code.launchpad.net/~xclude/avanzosc/mrp-6.1-Fix/+merge/190133
[FIX] Corrected UTF-8 coding for name in mrp_analytic_control
[FIX] Corrected translations for mrp_master_extension
Did also clean some code in both modules.
--
https://code.launchpad.net/~xclude/avanzosc/mrp-6.1-Fix/+merge/190133
Your team Avanzosc Manufacturing team is requested to review the proposed merge of lp:~xclude/avanzosc/mrp-6.1-Fix into lp:avanzosc/mrp-6.1.
=== modified file 'mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py'
--- mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py 2013-10-07 15:01:00 +0000
+++ mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py 2013-10-09 14:00:16 +0000
@@ -383,9 +383,8 @@
wrk_acc = account_analytic_obj.browse(cr, uid, prod_wrk_acc)[0]
wrk_acc.total_estimated = total_estimated
else:
- nombre = manufact_worker.name.name
values={
- 'name': prod_wrk_name_acc_code + " " + _('Worker')+ " " + str(nombre).encode('ascii', 'replace'),
+ 'name': prod_wrk_name_acc_code + " " + _('Worker')+ " " + manufact_worker.name.name,
'code': prod_wrk_name_acc_code ,
'currency_id': wizard_config.company_id.currency_id.id,
'company_id': wizard_config.company_id.id,
@@ -407,7 +406,6 @@
usr_search = usr_obj.search(cr,uid, [('operation','=',prod_op.id)])
usrs = usr_obj.browse(cr, uid, usr_search)
for manufact_worker in usrs:
- nombre = manufact_worker.user.name
prod_wrk_name_acc_code = op_acc_code + '-OP' + str(prod_op.sequence) + '-WK'+ str(manufact_worker.user.id)
prod_wrk_acc = account_analytic_obj.search(cr, uid, [('code','=', prod_wrk_name_acc_code)])
@@ -415,7 +413,7 @@
if not prod_wrk_acc:
values = {
- 'name': prod_wrk_name_acc_code + " " + _('Operator') + " " + str(nombre).encode('ascii', 'replace'),
+ 'name': prod_wrk_name_acc_code + " " + _('Operator') + " " + manufact_worker.user.name,
'code': prod_wrk_name_acc_code ,
'currency_id': wizard_config.company_id.currency_id.id,
'company_id': wizard_config.company_id.id,
=== modified file 'mrp_analytics_control/wizard/users.py'
--- mrp_analytics_control/wizard/users.py 2013-09-16 09:28:57 +0000
+++ mrp_analytics_control/wizard/users.py 2013-10-09 14:00:16 +0000
@@ -87,7 +87,7 @@
if not prod_op_acc:
raise osv.except_osv(_('ERROR'), _('Analytic Account with code: %s NOT FOUND') %(prod_acc_code))
else:
- # TODO: Change this to use code instead for translational option
+ # TODO: Change this to use code instead for translational option
# man_journal_search = account_analytic_jour_obj.search(cr, uid,[('code', '=', 'MRP')])
man_journal_search = account_analytic_jour_obj.search(cr, uid,[('name', '=', 'Manufacturing')])
man_jounal = account_analytic_jour_obj.browse(cr, uid, man_journal_search[0])
@@ -115,9 +115,8 @@
account_analytic_obj.recalculate_result(cr, uid, prod_wrk_acc[0])
else:
user = self.pool.get('res.users').browse(cr,uid,usr)
- nombre = user.name
values={
- 'name':prod_wrk_name_acc_code + " " + 'Operario '+ str(nombre),
+ 'name':prod_wrk_name_acc_code + " " + _('Operator') + " " + user.name,
'code':prod_wrk_name_acc_code ,
'currency_id':1,
'company_id':1,
@@ -148,7 +147,6 @@
usr_object = self.pool.get('res.users')
usr = usr_object.browse(cr,uid,user_in)
- nombre = usr.name
mrp_production = mrp_production_obj.browse(cr,uid,prod_in)
mrp_production_operation = mrp_production_operation_obj.browse(cr,uid,op_in)
@@ -159,17 +157,14 @@
prod_wrk_name_acc_code = parent_code + '-WK'+ str(user_in)
- values={
- 'name':prod_wrk_name_acc_code + " " + ' Operario '+ str(nombre),
- 'code':prod_wrk_name_acc_code ,
- 'currency_id':1,
- 'company_id':1,
- 'state':'open',
- 'parent_id':parent_account,
- 'acc_type':'OP'
- }
-
-
+ values={'name': prod_wrk_name_acc_code + " " + _('Operator') + " " + usr.name,
+ 'code': prod_wrk_name_acc_code ,
+ 'currency_id': 1, #TODO: Fix this
+ 'company_id': 1, #TODO: Fix this
+ 'state': 'open',
+ 'parent_id': parent_account,
+ 'acc_type': 'OP'
+ }
man_wrk_account = account_analityc_obj.create(cr, uid, values)
@@ -222,13 +217,14 @@
man_journal = account_analytic_jour_obj.browse(cr, uid, man_journal_search[0])
production = self.pool.get('mrp.production').browse(cr,uid,in_prod)
- values = {'amount': op_cost_amount*(-1),
+ values = {
+ 'amount': op_cost_amount*(-1),
'name': str(usr.name) + ' worker imputation2',
'date': in_date,
- 'company_id':1,
+ 'company_id': 1, # TODO: Fix this
'account_id': ope_account_id,
'general_account_id': operator_account,
- 'journal_id':man_journal.id,
+ 'journal_id': man_journal.id,
'ref': production.name,
'unit_amount': 1,
'product_id': usr.product_id.id
@@ -263,10 +259,10 @@
us = us_search[len(us_search)-1]
else:
values = {
- 'user' :context['wuser'],
- 'production_id':op.production_id.id,
- 'op':op.id,
- }
+ 'user': context['wuser'],
+ 'production_id': op.production_id.id,
+ 'op': op.id,
+ }
res = us_obj.create(cr, uid, values)
us_search = us_obj.search(cr, uid,[('user', '=', context['wuser'] ),('op','=',op.id)])
us = us_search[0]
@@ -585,16 +581,15 @@
else:
user = self.pool.get('res.users').browse(cr,uid,usr)
- nombre = user.name
values={
- 'name':prod_wrk_name_acc_code + " " + ' Operario '+ str(nombre),
- 'code':prod_wrk_name_acc_code ,
- 'currency_id':1,
- 'company_id':1,
- 'state':'open',
- 'parent_id':prod_op_acc[0],
- 'total_estimated':total_estimated,
- }
+ 'name': prod_wrk_name_acc_code + " " + _('Operator') + " " + user.name,
+ 'code': prod_wrk_name_acc_code ,
+ 'currency_id': 1, #TODO: Fix this
+ 'company_id': 1, #TODO: Fix this
+ 'state': 'open',
+ 'parent_id': prod_op_acc[0],
+ 'total_estimated': total_estimated,
+ }
man_wrk_account = account_analytic_obj.create(cr, uid, values)
=== modified file 'mrp_analytics_control/wizard/wc.py'
--- mrp_analytics_control/wizard/wc.py 2013-09-16 09:28:57 +0000
+++ mrp_analytics_control/wizard/wc.py 2013-10-09 14:00:16 +0000
@@ -44,7 +44,6 @@
usr_object = self.pool.get('res.users')
usr = usr_object.browse(cr,uid,user_in)
- nombre = usr.name
mrp_production = mrp_production_obj.browse(cr,uid,prod_id)
mrp_production_operation = mrp_production_operation_obj.browse(cr,uid,op_in)
@@ -57,14 +56,14 @@
prod_wrk_name_acc_code = parent_code + '-WK'+ str(user_in)
values={
- 'name':prod_wrk_name_acc_code + " " + ' Operario '+ str(nombre),
- 'code':prod_wrk_name_acc_code ,
- 'currency_id':1,
- 'company_id':1,
- 'state':'open',
- 'parent_id':parent_account,
- 'acc_type':'MA'
- }
+ 'name': prod_wrk_name_acc_code + " " + _('Operator') + " " + usr.name,
+ 'code': prod_wrk_name_acc_code,
+ 'currency_id': 1, #TODO: Fix this
+ 'company_id': 1, #TODO: Fix this
+ 'state': 'open',
+ 'parent_id': parent_account,
+ 'acc_type': 'MA'
+ }
man_wrk_account = account_analityc_obj.create(cr, uid, values)
@@ -112,13 +111,13 @@
man_journal = account_analytic_jour_obj.browse(cr, uid, man_journal_search[0])
values = {
- 'amount':op_cost_amount*(-1),
- 'name':in_description,
- 'date':in_date,
+ 'amount': op_cost_amount*(-1),
+ 'name': in_description,
+ 'date': in_date,
'company_id': wc.factory_id.company_id.id,
'account_id': ope_account_id,
'general_account_id': wc.factory_id.company_id.workcenter_account.id,
- 'journal_id':man_journal.id,
+ 'journal_id': man_journal.id,
}
new_id = account_analytic_line_obj.create(cr, uid, values)
account_analytic_obj.recalculate_result(cr, uid, ope_account_id)
@@ -155,7 +154,7 @@
'date': context['work_date'],
'descript': context['descript'],
'production': prod.id,
- 'real_op' : real_id.id
+ 'real_op': real_id.id
}
res = ops_wc_obj.create(cr, uid, values)
@@ -211,12 +210,12 @@
values = {
'wc': wc.id,
- 'operation':context['operation'],
+ 'operation': context['operation'],
'time': context['wtime'],
- 'date':context['work_date'],
- 'descript':context['descript'],
- 'production':prod.id,
- 'real_op' : real_id.id
+ 'date': context['work_date'],
+ 'descript': context['descript'],
+ 'production': prod.id,
+ 'real_op': real_id.id
}
res = ops_wc_obj.create(cr, uid, values)
=== modified file 'mrp_master_extension/i18n/en_US.pot'
--- mrp_master_extension/i18n/en_US.pot 2013-09-09 13:38:16 +0000
+++ mrp_master_extension/i18n/en_US.pot 2013-10-09 14:00:16 +0000
@@ -1583,8 +1583,8 @@
#. module: mrp_master_extension
#: field:mrp.bom,consuming_amount:0
#: field:mrp.production.product.line,consuming_amount:0
-msgid "Ctad Fija"
-msgstr "Ctad Fija"
+msgid "QTY Fixed"
+msgstr "QTY Fixed"
#. module: mrp_master_extension
#: model:ir.actions.act_window,name:mrp_master_extension.action_product_bom_structure
=== modified file 'mrp_master_extension/i18n/es.po'
--- mrp_master_extension/i18n/es.po 2013-09-09 13:38:16 +0000
+++ mrp_master_extension/i18n/es.po 2013-10-09 14:00:16 +0000
@@ -1585,7 +1585,7 @@
#. module: mrp_master_extension
#: field:mrp.bom,consuming_amount:0
#: field:mrp.production.product.line,consuming_amount:0
-msgid "Ctad Fija"
+msgid "QTY Fixed"
msgstr "Ctad Fija"
#. module: mrp_master_extension
=== modified file 'mrp_master_extension/mrp_bom.py'
--- mrp_master_extension/mrp_bom.py 2013-09-16 13:38:08 +0000
+++ mrp_master_extension/mrp_bom.py 2013-10-09 14:00:16 +0000
@@ -441,7 +441,7 @@
raise osv.except_osv(_('Error'),_('No encontrada la localizacion DESECHADO'))
line = {'mrp_bom_operations_product_id': operation.id,
'bom_id': operation.bom_id.id,
- 'product_id' : operation.product_id.id,
+ 'product_id': operation.product_id.id,
'product_qty': qty,
'product_uom': operation.product_id.uom_id.id,
'location_id': location_ids[0]
@@ -506,8 +506,8 @@
'mrp_bom_operations_product_id': fields.many2one('mrp.bom.operations.product','Consumed On'),
'final_product_line_ids': fields.one2many('mrp.bom.final.product', 'bom_id', 'Final Product Lines'),
'routing_id_name': fields.char('Routing',size=64),
- 'fixed_costs':fields.one2many('bom.fixed.cost','bom_id','Fixed costs'),
- 'consuming_amount':fields.boolean('Ctad Fija'),
+ 'fixed_costs': fields.one2many('bom.fixed.cost','bom_id','Fixed costs'),
+ 'consuming_amount': fields.boolean('QTY Fixed'),
# Precio de compra para cabecera de lista de materiales
'mat_cost_price': fields.float(_('Mat.Cost Price'), digits_compute=dp.get_precision('Purchase Price')),
# Precio de compra para cabecera de lista de materiales
Follow ups
