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

[MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-purchase-tch

Browse Source 
bzr revid: jam@tinyerp.com-20120619085410-y42cd5vqkiy73we7
This commit is contained in:
Jigar Amin - OpenERP
2012-06-19 14:24:10 +05:30
parent 833692b53b 26ef8c33e2
commit 6ec1de1314
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/purchase.py
+1 -1
View File
@@ -913,7 +913,7 @@ class purchase_order_line(osv.osv):
# - determine product_qty and date_planned based on seller info
if not date_order:
date_order = fields.date.context_today(cr,uid,context=context)
date_order = fields.date.context_today(self,cr,uid,context=context)
qty = qty or 1.0
supplierinfo = False
addons/purchase/res_config_view.xml
+1 -2
View File
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Configure Purchases" version="7.0">
<header>
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
<button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
</header>
<sheet>
<group col="4">
addons/purchase/wizard/purchase_line_invoice_view.xml
+4 -3
View File
@@ -11,10 +11,11 @@
<field name="arch" type="xml">
<form string="Select an Open Sale Order" version="7.0">
<header>
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" />
<button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<label string="Do you want to generate the supplier invoices?"/>
<group>
<label string="Do you want to generate the supplier invoices?"/>
</group>
</form>
</field>
</record>
addons/purchase/wizard/purchase_order_group_view.xml
+6 -4
View File
@@ -8,11 +8,11 @@
<field name="arch" type="xml">
<form string="Merge orders" version="7.0">
<header>
<button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert" class="oe_form_button_active_flow"/>
</header>
<separator string="Are you sure you want to merge these orders?"/>
<label string="
<group>
<separator string="Are you sure you want to merge these orders?"/>
<label string="
Please note that: &#10; &#10;
Orders will only be merged if: &#10;
* Purchase Orders are in draft &#10;
@@ -21,6 +21,8 @@ Orders will only be merged if: &#10;
Lines will only be merged if: &#10;
* Order lines are exactly the same except for the product,quantity and unit &#10;
" colspan="4"/>
</group>
</form>
</field>
</record>
addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+1 -2
View File
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Purchase Requisition" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
<button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
<button icon="gtk-ok" name="create_order" string="Create Quotation" type="object" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="partner_id"/>