pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1

Browse Source 
bzr revid: sbh@tinyerp.com-20101227094953-8p70yt1pg31b9l5n
This commit is contained in:
Sbh (OpenERP)
2010-12-27 15:19:53 +05:30
parent d49df35eb4 f8b87f9a66
commit 85dacde05f
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/report/purchase_report.py
+2 -5
View File
@@ -99,12 +99,9 @@ class purchase_report(osv.osv):
extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
count(*) as nbr,
(l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
avg(case when t.standard_price <= 0 then (l.price_unit*l.product_qty*u.factor)
else
(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))
end) as negociation,
avg(100.0 * (l.price_unit*l.product_qty*u.factor)/(nullif(t.standard_price*l.product_qty*u.factor,0)))::decimal(16,2) as negociation,
sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
(sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
(sum(l.product_qty*l.price_unit)/sum(nullif(l.product_qty*u.factor,0)))::decimal(16,2) as price_average
from purchase_order s
left join purchase_order_line l on (s.id=l.order_id)
left join product_product p on (l.product_id=p.id)
addons/sale/report/sale_report.py
+2 -1
View File
@@ -94,7 +94,8 @@ class sale_report(osv.osv):
u.name as uom_name,
sum(l.product_uom_qty * u.factor) as product_uom_qty,
sum(l.product_uom_qty*l.price_unit) as price_total,
(sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor)*count(l.product_id))::decimal(16,2) as price_average,
(sum(l.product_uom_qty*l.price_unit)/sum(nullif(l.product_uom_qty * u.factor,0))*count(l.product_id))::decimal(16,2) as price_average,
pt.categ_id, l.order_id
from
sale_order_line l
addons/stock/stock_view.xml
+7 -5
View File
@@ -10,12 +10,12 @@
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
<menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
parent="stock.menu_stock_product" sequence="0"/>
parent="stock.menu_stock_product" sequence="0"/>
<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
<menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
<menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager"/>
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
<menuitem
<menuitem
id="menu_product_in_config_stock" name="Product"
parent="stock.menu_stock_configuration" sequence="2"/>
<menuitem
@@ -24,7 +24,7 @@
<menuitem
action="product.product_ul_form_action" groups="base.group_extended"
id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
<menuitem
<menuitem
id="menu_stock_unit_measure_stock" name="Units of Measure"
parent="stock.menu_product_in_config_stock" sequence="2"/>
<menuitem
@@ -1659,7 +1659,8 @@
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
<field name="tracking_id" context="{'tracking': self}"/>
<field name="prodlot_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8">
@@ -1694,7 +1695,8 @@
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
<field name="tracking_id" context="{'tracking_id': self}"/>
<field name="prodlot_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="8">