Amit Parmar (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-kanban-views2-purchase_order_quatation_request-aar
into lp:~openerp-dev/openobject-addons/trunk-kanban-views2.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-kanban-views2-purchase_order_quatation_request-aar/+merge/77898
Hello Sir
I have created kanban views purchase_orders and Quatation_Requests in this
branch
Thanks
Amit Parmar
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-kanban-views2-purchase_order_quatation_request-aar/+merge/77898
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-kanban-views2.
=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py 2011-09-27 16:52:19 +0000
+++ account/wizard/account_report_common.py 2011-10-03 10:49:57 +0000
@@ -35,7 +35,7 @@
'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
'period_from': fields.many2one('account.period', 'Start Period'),
'period_to': fields.many2one('account.period', 'End Period'),
- 'journal_ids': fields.many2many('account.journal', string='Journals', required=True),
+ 'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
'date_from': fields.date("Start Date"),
'date_to': fields.date("End Date"),
'target_move': fields.selection([('posted', 'All Posted Entries'),
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2011-10-02 15:48:02 +0000
+++ purchase/purchase.py 2011-10-03 10:49:57 +0000
@@ -215,6 +215,7 @@
'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
'create_uid': fields.many2one('res.users', 'Responsible'),
'company_id': fields.many2one('res.company','Company',required=True,select=1),
+ 'color': fields.integer('Color Index'),
}
_defaults = {
'date_order': lambda *a: time.strftime('%Y-%m-%d'),
@@ -223,6 +224,7 @@
'shipped': 0,
'invoice_method': 'order',
'invoiced': 0,
+ 'color': 0,
'partner_address_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['default'])['default'],
'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2011-10-02 15:48:02 +0000
+++ purchase/purchase_view.xml 2011-10-03 10:49:57 +0000
@@ -324,16 +324,99 @@
</tree>
</field>
</record>
-
+
+ <!-- purchase Kanban View -->
+ <record model="ir.ui.view" id="purchase_order_kanban_view">
+ <field name="name">PURCHASE - Orders Kanban</field>
+ <field name="model">purchase.order</field>
+ <field name="type">kanban</field>
+ <field name="arch" type="xml">
+ <kanban default_group_by="state">
+ <templates>
+ <t t-name="kanban-box">
+ <t t-set="color" t-value="kanban_color(record.color.raw_value || record.state.raw_value)"/>
+ <div t-att-class="color + (Math.max(0,record.state.raw_value) == 'cancel' ? ' oe_kanban_color_alert' : '')">
+ <div class="oe_kanban_box oe_kanban_color_border">
+ <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
+ <tr>
+ <td class="oe_kanban_title3" align="left" valign="middle">
+ <field name="name"/>
+ </td>
+ <td class="oe_kanban_title3" align="right" valign="middle">
+ <field name="date_order"/>
+ </td>
+ </tr>
+ </table>
+ <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+ <div class="oe_kanban_left">
+ <b><field name="partner_id"/></b>
+ </div>
+ <div class="oe_kanban_right oe_kanban_small">
+ <t t-if="record.validator.value">
+ Validated by : <field name="validator"/>
+ </t>
+ </div>
+ <br/>
+ <div>
+ <field name="partner_address_id"/>
+ </div>
+ <div>
+ Untaxed : <b><field name="amount_untaxed"/></b>
+ Tax : <b><field name="amount_tax"/></b>
+ Total : <b><field name="amount_total"/></b>
+ </div>
+ </div>
+ <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
+ <div class="oe_kanban_left">
+ <a string="Edit" icon="gtk-edit" type="edit"/>
+ <a string="Delete" icon="gtk-close" type="delete"/>
+ <a string="Change Color" icon="color-picker" type="color" name="color"/>
+ </div>
+ <div class="oe_kanban_right">
+ <a name="purchase_cancel" type="button" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+ <a name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+ <a name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
+ <a name="picking_ok" type="button" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
+ <a name="invoice_ok" type="button" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
+ <a name="wkf_confirm_order" type="object" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
+ <a name="purchase_appbuyer" type="button" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
+ <a name="purchase_approve" type="object" states="confirmed" string="Approved" icon="gtk-go-forward"/>
+ <a name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+ </div>
+ <br class="oe_kanban_clear"/>
+ </div>
+ </div>
+ </div>
+ </t>
+ </templates>
+ </kanban>
+ </field>
+ </record>
+
<record id="purchase_rfq" model="ir.actions.act_window">
<field name="name">Requests for Quotation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="context">{'search_default_draft': 1}</field>
- <field name="view_mode">tree,form,graph,calendar</field>
+ <field name="view_mode">tree,form,graph,calendar,kanban</field>
<field name="search_view_id" ref="view_request_for_quotation_filter"/>
<field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
</record>
+
+ <record id="open_view_purchase_order_tree" model="ir.actions.act_window.view">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="purchase_order_tree"/>
+ <field name="act_window_id" ref="purchase_rfq"/>
+ </record>
+
+ <record id="open_view_purchase_order_form" model="ir.actions.act_window.view">
+ <field name="sequence" eval="2"/>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="purchase_order_form"/>
+ <field name="act_window_id" ref="purchase_rfq"/>
+ </record>
+
<menuitem action="purchase_rfq" id="menu_purchase_rfq"
parent="menu_procurement_management"
sequence="6"/>
@@ -342,11 +425,27 @@
<field name="name">Purchase Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
- <field name="view_mode">tree,form,graph,calendar</field>
+ <field name="view_mode">tree,form,graph,calendar,kanban</field>
<field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
</record>
+
+ <record id="open_purchase_order_tree" model="ir.actions.act_window.view">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="purchase_order_tree"/>
+ <field name="act_window_id" ref="purchase_form_action"/>
+ </record>
+
+ <record id="open_purchase_order_form" model="ir.actions.act_window.view">
+ <field name="sequence" eval="2"/>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="purchase_order_form"/>
+ <field name="act_window_id" ref="purchase_form_action"/>
+ </record>
+
+
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
