Merge lp:~javieredm/openmrp/6.0 into lp:openmrp/6.0

[Javier Duran]

Correcciones de varios bug en la rama 6.0.

[Daniel Campos (Avanzosc) (dani-ds)]

Hola Javier, he visto que eliminas 2 funciones, la write y la create, cual es la razón?

Unmerged revisions

253. By Javier Duran on 2014-07-29

[FIX] Correccion para que no solicite la cuenta analitica al momento de calcular datos en la orden de produccion

252. By root <email address hidden> on 2014-07-25

[FIX] Corrección del bug1340368

251. By root <email address hidden> on 2014-07-25

[FIX] Corrección del bug1340407

250. By root <email address hidden> on 2014-07-25

[FIX] Corrección del bug1340396

=== modified file 'mrp_analytics_control/production.py'
--- mrp_analytics_control/production.py	2014-07-11 07:52:34 +0000
+++ mrp_analytics_control/production.py	2014-07-29 14:37:11 +0000
@@ -385,17 +385,6 @@
     _inherit = 'mrp.fixed.cost'
     _name = 'mrp.fixed.cost'
     _description = 'MRP fixed costs'
-#
-#    def change_name(self, cr, uid, ids, name):
-#        me = self.browse(cr, uid, ids)[0]
-#        if True:
-#                warning = {
-#                    'title': _('Warning!'),
-#                    'message': _('Not allowed to change the name of fixed costs!')
-#                }
-#                return {'warning': warning}
-#        else:
-#            return {'value': {'created': True}}
 
     def unlink(self, cr, uid, ids, context=None):
         if 'delete_costs' in context:
@@ -404,87 +393,6 @@
             raise osv.except_osv(_('Unable to perform action'), _('Not allowed to delete the fixed costs, set its quantity to 0!'))
         return True
 
-    def write(self, cr, uid, ids, vals, context=None):
-        fix = self.browse(cr, uid, ids, context)
-        if vals['name'] != fix[0].name:
-            raise osv.except_osv(_('Unable to perform action'), _('Not allowed to change the name of fixed costs!'))
-        res = super(mrp_fixed_cost, self).write(cr, uid, ids, vals, context=context)
-
-        account_analytic_line_obj = self.pool.get('account.analytic.line')
-        account_analytic_obj = self.pool.get('account.analytic.account')
-
-        for cost in fix:
-            code = 'OF' + cost.production_id.name.lstrip('OF/') + '-FIX'
-            fix_acc_search = account_analytic_obj.search(cr, uid, [('code', '=', 'OF' + str(cost.production_id.id) + "FIX")])
-            if fix_acc_search:
-                line_search = account_analytic_line_obj.search(cr, uid, [
-                    ('name', '=', cost.name),
-                    ('account_id', '=', fix_acc_search[0])
-                ])
-                if line_search:
-                    account_analytic_line_obj.write(cr, uid, line_search[0], {'amount': (cost.amount * (-1))})
-                    account_analytic_obj.recalculate_result(cr, uid, fix_acc_search[0])
-                else:
-                    raise osv.except_osv(_('Programming Error'), _('Error in reading the analytic account line'))
-            else:
-                raise osv.except_osv(_('Error'), _('Analytic Account with code: %s NOT FOUND') % (code))
-        return res
-
-    def create(self, cr, uid, vals, context=None):
-        mrp_production_obj = self.pool.get('mrp.production')
-        mrp_production = mrp_production_obj.browse(cr, uid, vals['production_id'])
-        fix_created = super(mrp_fixed_cost, self).create(cr, uid, vals, context=context)
-        account_analytic_obj = self.pool.get('account.analytic.account')
-        account_analytic_jour_obj = self.pool.get('account.analytic.journal')
-        code = 'OF' + mrp_production.name.lstrip('OF/')
-        acc_search = account_analytic_obj.search(cr, uid, [('code', '=', code)])
-        if not acc_search:
-            raise osv.except_osv(_('Error'), _('Analytic Account with code: %s NOT FOUND') % (code))
-
-        acc_id = False
-        if acc_search:
-            acc_id = acc_search[0]
-        # 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')])
-
-        if acc_id:
-            account_analytic_line_obj = self.pool.get('account.analytic.line')
-            op_acc_code = False
-            prod_maq_name_acc_code = False
-            code = 'OF' + mrp_production.name.lstrip('OF/') + '-FIX'
-            man_fix_account = account_analytic_obj.search(cr, uid, [('code', '=', code)])[0]
-
-            if not man_fix_account:
-                #Crear cuenta analitica de costes fijos
-                est = 0
-
-                man_fix_account = account_analytic_obj.create(cr, uid, {
-                    'name': prod_maq_name_acc_code + " " + _('Fixed'),
-                    'code': prod_maq_name_acc_code,
-                    'currency_id': mrp_production.company_id.currency_id.id,
-                    'company_id': mrp_production.company_id.id,
-                    'state': 'open',
-                    'parent_id': acc_id,
-                    'total_estimated': est,
-                    'total_estimated_puc': 0,
-                    'total_estimated_standard': 0,
-                    'acc_type': 'FIX'
-                })
-                account_analytic_obj.recalculate_result(cr, uid, man_fix_account)
-
-            #añadir costes reales de costes fijos
-            new_id = account_analytic_line_obj.create(cr, uid, {
-                'amount': vals['amount'] * (-1),
-                'name': vals['name'],
-                'date': datetime.today(),
-                'company_in': mrp_production.company_id.id,
-                'account_id': man_fix_account,
-                'general_account_id': mrp_production.company_id.material_account.id,
-                'journal_id': man_journal_search[0],
-            })
-            account_analytic_obj.recalculate_result(cr, uid, man_fix_account)
-
-        return True
+
 
 mrp_fixed_cost()

=== modified file 'mrp_analytics_control/wizard/users.py'
--- mrp_analytics_control/wizard/users.py	2014-02-14 13:49:47 +0000
+++ mrp_analytics_control/wizard/users.py	2014-07-29 14:37:11 +0000
@@ -162,7 +162,7 @@
         values={
         'name':prod_wrk_name_acc_code + " " + ' Operario '+ str(nombre),
         'code':prod_wrk_name_acc_code ,
-        'currency_id':1,
+        'currency_id'::mrp_production.company_id.currency_id.id,
         'company_id':mrp_production.company_id.id,
         'state':'open',
         'parent_id':parent_account,
@@ -208,7 +208,7 @@
         
         #busqueda y asignación de cuenta analitica correspondiente
         
-        ope_acc_code = 'OF' + str(mrp_production.name.lstrip('OF/')) + '-OP' + str(mrp_production_operation.sequence) + 'WK'+ str(in_user)
+        ope_acc_code = 'OF' + str(mrp_production.name.lstrip('OF/')) + '-OP' + str(mrp_production_operation.sequence) + '-WK'+ str(in_user)
         
         ope_account_id = False
         

=== modified file 'mrp_manufacturing_cost/cost.py'
--- mrp_manufacturing_cost/cost.py	2014-02-14 13:49:47 +0000
+++ mrp_manufacturing_cost/cost.py	2014-07-29 14:37:11 +0000
@@ -67,7 +67,7 @@
             
         aux_prod = self.pool.get('mrp.production')
         aux_prod_op = self.pool.get('mrp.production.operation')
-        op = aux_prod_op.browse(cr , uid, context['operation'])
+        op = aux_prod_op.browse(cr , uid, data['operation'])
             
         if 'production' in data:
             op = self.pool.get('mrp.production').browse(cr, uid, data['production'])