odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]fix typo and improved layout 

bzr revid: mba@tinyerp.com-20140113103617-vu9hftagrqx0dqa2
This commit is contained in:
Mahendra Barad (OpenERP) 2014-01-13 16:06:17 +05:30
parent 7565880648
commit 6b90f0a6d5
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/sale/res_config.py
View File

@ -65,6 +65,8 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
help='This adds the \'Margin\' on sales order.\n'
'This gives the profitability by calculating the difference between the Unit Price and Cost Price.\n'
'-This installs the module sale_margin.'),
'module_website_quotation': fields.boolean("Allow online quotation.",
help='This adds the online quotation'),
'module_sale_journal': fields.boolean("Allow batch invoicing of delivery orders through journals",
help='Allows you to categorize your sales and deliveries (picking lists) between different journals, '
'and perform batch operations on journals.\n'

4
addons/sale/res_config_view.xml
View File

@ -77,6 +77,10 @@
</group>
</group>
<div name="Sale Features" position="inside">
<div name="module_website_quotation">
<field name="module_website_quotation" class="oe_inline"/>
<label for="module_website_quotation"/>
</div>
<div name="module_sale_margin">
<field name="module_sale_margin" class="oe_inline"/>
<label for="module_sale_margin"/>

2
addons/website_quotation/__openerp__.py
View File

@ -1,5 +1,5 @@
{
'name': 'Quote Roller',
'name': 'Online Quotation',
'category': 'Website',
'summary': 'Send Live Quotation',
'version': '1.0',

12
addons/website_quotation/views/website_quotation.xml
View File

@ -158,7 +158,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
<h4 class="modal-title">Please confirm you accept this order:</h4>
<h4 class="modal-title">You are near to validate the sale order. Please check your data and validate the Order.</h4>
</div>
<form id="accept" method="POST" t-attf-action="/quote/#{quotation.id}/#{quotation.access_token}/accept">
<div class="modal-body">
@ -172,7 +172,7 @@
</dl>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-success">Validate Order</button>
<button type="submit" class="btn btn-success">Validate Order</button> or
<button type="button" class="btn btn-default" data-dismiss="modal">Discard</button>
</div>
</form>
@ -182,7 +182,7 @@
<div class="alert alert-warning alert-dismissable" t-if="quotation.state == 'cancel'">
<button type="button" class="close hidden-print" data-dismiss="alert" aria-hidden="true">&amp;times;</button>
<strong>This quotation has been canceled.</strong> Contact <p t-field="quotation.user_id"/> to ask a new one.
<strong>This quotation has been canceled.</strong> Contact <span t-field="quotation.user_id"/> ( <span t-if="quotation.user_id.email"> <span class="fa fa-envelope" t-field="quotation.user_id.email" /></span> <span t-if="quotation.user_id.phone"> <span class="fa fa-phone" t-field="quotation.user_id.phone"/></span> ) in order to ask a new quote.
</div>
<div class="modal fade" id="modeldecline" role="dialog" aria-hidden="true">
@ -190,15 +190,15 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
<h4 class="modal-title">Reason</h4>
<h4 class="modal-title">Please give us your feedback on reason you are refusing this quotation.</h4>
</div>
<form id="decline" method="POST" t-attf-action="/quote/#{quotation.id}/#{quotation.access_token}/decline">
<div class="modal-body">
<textarea rows="3" name="decline_message" placeholder="Your Comment....." class="form-control"> </textarea>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="submit" t-att-id="quotation.id" class="btn btn-info">Post</button>
<button type="submit" t-att-id="quotation.id" class="btn btn-info">Post</button> or
<button type="button" class="btn btn-default" data-dismiss="modal">Discard</button>
</div>
</form>
</div>

6
addons/website_quotation/views/website_quotation_backend.xml
View File

@ -39,10 +39,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sale Quotation Template" version="7.0">
<header>
<button string="Edit Template" type="object" name="open_template" class="oe_highlight"/>
</header>
<sheet>
<div class="oe_button_box oe_right" name="buttons">
<button string="Template" type="object" name="open_template"/>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>