Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-account-variation-servicios-dev-yzk into lp:addons-vauxoo/6.1

  1. addons-vauxoo-account-variation-servicios-dev-yzk
  2. Merge into 6.1
Proposed by Isaac López Zúñiga
Status: Merged
Merged at revision: 549
Proposed branch: lp:~vauxoo/addons-vauxoo/addons-vauxoo-account-variation-servicios-dev-yzk
Merge into: lp:addons-vauxoo/6.1
Diff against target: 30 lines (+10/-6)
1 file modified
mrp_account_variation/mrp_account_variation.py (+10/-6)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-account-variation-servicios-dev-yzk
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+131506@code.launchpad.net

Description of the change

Validación si es producto de tipo servicio, si es así, toma la cuenta de valoración de existencias de la categoría del producto

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mrp_account_variation/mrp_account_variation.py'
2--- mrp_account_variation/mrp_account_variation.py 2012-10-05 14:39:30 +0000
3+++ mrp_account_variation/mrp_account_variation.py 2012-10-26 00:53:22 +0000
4@@ -74,16 +74,20 @@
5 if context.get('type',False) == 'consumed':
6 if product.quantity > 0:
7 if product.product_id.property_stock_production.valuation_in_account_id:
8- src_acc = product.product_id.property_stock_production.valuation_in_account_id.id
9- if product.product_id.property_stock_production.variation_in_account_id:
10- dest_acc = product.product_id.property_stock_production.variation_in_account_id.id
11+ src_acc = product.product_id.property_stock_production.valuation_in_account_id and product.product_id.property_stock_production.valuation_in_account_id.id or False
12+ if product.product_id.type == 'service':
13+ dest_acc = product.product_id.categ_id.property_stock_valuation_account_id and product.product_id.categ_id.property_stock_valuation_account_id.id or False
14+ elif product.product_id.property_stock_production.variation_in_account_id:
15+ dest_acc = product.product_id.property_stock_production.variation_in_account_id and product.product_id.property_stock_production.variation_in_account_id.id or False
16 reference_amount = product.cost_variation
17
18 if product.quantity < 0:
19- if product.product_id.property_stock_production.variation_in_account_id:
20- src_acc = product.product_id.property_stock_production.variation_in_account_id.id
21+ if product.product_id.type == 'service':
22+ src_acc = product.product_id.categ_id.property_stock_valuation_account_id and product.product_id.categ_id.property_stock_valuation_account_id.id or False
23+ elif product.product_id.property_stock_production.variation_in_account_id:
24+ src_acc = product.product_id.property_stock_production.variation_in_account_id and product.product_id.property_stock_production.variation_in_account_id.id or False
25 if product.product_id.property_stock_production.valuation_in_account_id:
26- dest_acc = product.product_id.property_stock_production.valuation_in_account_id.id
27+ dest_acc = product.product_id.property_stock_production.valuation_in_account_id and product.product_id.property_stock_production.valuation_in_account_id.id or False
28 reference_amount = product.cost_variation*-1
29
30 if context.get('type',False) == 'produced':