Harry (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons5-sale-hmo into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons5-sale-hmo/+merge/124122
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons5-sale-hmo/+merge/124122
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons5-sale-hmo.
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2012-08-08 10:59:07 +0000
+++ account_budget/account_budget_view.xml 2012-09-13 08:18:17 +0000
@@ -299,7 +299,7 @@
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<notebook position="inside">
- <page string="Budget Lines">
+ <page string="Budget Lines" groups="account.group_account_user">
<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
<tree string="Budget Lines" editable="top">
<field name="crossovered_budget_id"/>
=== modified file 'account_budget/security/ir.model.access.csv'
--- account_budget/security/ir.model.access.csv 2012-07-06 15:08:17 +0000
+++ account_budget/security/ir.model.access.csv 2012-09-13 08:18:17 +0000
@@ -4,4 +4,4 @@
access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
-access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,0,0,0
+access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,0,1,0
=== modified file 'crm/res_config.py'
--- crm/res_config.py 2012-09-02 19:38:35 +0000
+++ crm/res_config.py 2012-09-13 08:18:17 +0000
@@ -38,9 +38,6 @@
'module_import_google': fields.boolean("Google (Contacts and Calendar)",
help="""Import google contact in partner address and add google calendar events details in Meeting.
This installs the module import_google."""),
- 'module_google_map': fields.boolean("add google maps on customers",
- help="""Locate customers on Google Map.
- This installs the module google_map."""),
'group_fund_raising': fields.boolean("Manage Fund Raising",
implied_group='crm.group_fund_raising',
help="""Allows you to trace and manage your activities for fund raising."""),
=== modified file 'crm/res_config_view.xml'
--- crm/res_config_view.xml 2012-08-14 12:30:50 +0000
+++ crm/res_config_view.xml 2012-09-13 08:18:17 +0000
@@ -32,12 +32,6 @@
</div>
</group>
</div>
- <div name="Customer Features" position="inside">
- <div>
- <field name="module_google_map" class="oe_inline"/>
- <label for="module_google_map"/>
- </div>
- </div>
</field>
</record>
=== modified file 'crm/security/crm_security.xml'
--- crm/security/crm_security.xml 2012-07-31 11:16:45 +0000
+++ crm/security/crm_security.xml 2012-09-13 08:18:17 +0000
@@ -3,18 +3,21 @@
<data noupdate="0">
<record id="base.group_sale_salesman" model="res.groups">
- <field name="name">User - Own Leads Only</field>
+ <field name="name">See Own Leads</field>
<field name="category_id" ref="base.module_category_sales_management"/>
+ <field name="comment">the user will have access to his own data in the sales application.</field>
</record>
<record id="base.group_sale_salesman_all_leads" model="res.groups">
- <field name="name">User - All Leads</field>
+ <field name="name">See all Leads</field>
<field name="category_id" ref="base.module_category_sales_management"/>
<field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+ <field name="comment">the user will have access to all records of everyone in the sales application.</field>
</record>
<record id="base.group_sale_manager" model="res.groups">
<field name="name">Manager</field>
+ <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
<field name="category_id" ref="base.module_category_sales_management"/>
<field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-09-11 09:40:07 +0000
+++ sale/sale.py 2012-09-13 08:18:17 +0000
@@ -582,6 +582,13 @@
result.update(view_id = res and res[1] or False)
return result
+ def test_no_product(self, cr, uid, ids, *args):
+ for order in self.browse(cr, uid, ids):
+ for line in order.order_line:
+ if line.product_id:
+ return False
+ return True
+
def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
res = False
invoices = {}
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-09-12 17:16:36 +0000
+++ sale/sale_view.xml 2012-09-13 08:18:17 +0000
@@ -163,7 +163,7 @@
<button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
<button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
<button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
- attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
+ attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/> <!-- ('invoice_ids','=',[]) should be work-->
<button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
<button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
@@ -183,9 +183,15 @@
</h1>
<group>
<group>
+<<<<<<< TREE
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
<field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
<field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
+=======
+ <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+ <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_parent_id': partner_id}"/>
+ <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_parent_id': partner_id}"/>
+>>>>>>> MERGE-SOURCE
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
</group>
<group>
=== modified file 'sale/sale_workflow.xml'
--- sale/sale_workflow.xml 2012-05-25 13:35:36 +0000
+++ sale/sale_workflow.xml 2012-09-13 08:18:17 +0000
@@ -162,7 +162,7 @@
<record id="trans_router_wait_invoice_shipping" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice_end"/>
- <field name="condition">(order_policy=='picking')</field>
+ <field name="condition">(order_policy=='picking') and (not test_no_product())</field>
</record>
<record id="trans_router_wait_invoice" model="workflow.transition">
@@ -196,7 +196,7 @@
<record id="trans_wait_invoice_invoice" model="workflow.transition">
<field name="act_from" ref="act_wait_invoice"/>
<field name="act_to" ref="act_invoice"/>
- <field name="condition">(order_policy=='prepaid')</field>
+ <field name="condition">(order_policy=='prepaid') or test_no_product()</field>
</record>
<record id="trans_wait_invoice_invoice_manual" model="workflow.transition">
=== modified file 'sale_journal/sale_journal.py'
--- sale_journal/sale_journal.py 2011-12-21 15:16:39 +0000
+++ sale_journal/sale_journal.py 2012-09-13 08:18:17 +0000
@@ -61,6 +61,21 @@
}
picking()
+class stock_picking_in(osv.osv):
+ _inherit = "stock.picking.in"
+ _columns = {
+ 'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
+ }
+stock_picking_in()
+
+class stock_picking_out(osv.osv):
+ _inherit = "stock.picking.out"
+ _columns = {
+ 'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
+ }
+stock_picking_out()
+
+
class sale(osv.osv):
_inherit = "sale.order"
_columns = {
=== modified file 'sale_journal/sale_journal_view.xml'
--- sale_journal/sale_journal_view.xml 2012-08-09 06:05:16 +0000
+++ sale_journal/sale_journal_view.xml 2012-09-13 08:18:17 +0000
@@ -42,7 +42,7 @@
</record>
<menuitem id="menu_definition_journal_invoice_type" sequence="15"
- parent="base.menu_sales_configuration_misc" action="action_definition_journal_invoice_type" groups="base.group_no_one"/>
+ parent="base.menu_sales_configuration_misc" action="action_definition_journal_invoice_type"/>
<!-- Inherit sales order form view -->
@@ -52,7 +52,7 @@
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <field name="invoice_type_id" widget="selection"/>
+ <field name="invoice_type_id"/>
</field>
</field>
</record>
@@ -64,8 +64,8 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_tree" />
<field name="arch" type="xml">
- <field name="state" position="after">
- <field name="invoice_type_id" widget="selection"/>
+ <field name="state" position="before">
+ <field name="invoice_type_id"/>
</field>
</field>
</record>
@@ -77,8 +77,8 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form" />
<field name="arch" type="xml">
- <field name="origin" position="after">
- <field name="invoice_type_id" widget="selection"/>
+ <field name="move_type" position="before">
+ <field name="invoice_type_id"/>
</field>
</field>
</record>
@@ -90,7 +90,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.vpicktree" />
<field name="arch" type="xml">
- <field name="origin" position="after">
+ <field name="state" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@@ -98,10 +98,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_in">
<field name="name">stock.picking.journal.view.form</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.in</field>
<field name="inherit_id" ref="stock.view_picking_in_form" />
<field name="arch" type="xml">
- <field name="origin" position="after">
+ <field name="move_type" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@@ -109,10 +109,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
<field name="name">stock.picking.journal.view.tree</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.in</field>
<field name="inherit_id" ref="stock.view_picking_in_tree" />
<field name="arch" type="xml">
- <field name="origin" position="after">
+ <field name="state" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@@ -120,10 +120,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_out">
<field name="name">stock.picking.journal.view.form</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_out_form" />
<field name="arch" type="xml">
- <field name="origin" position="after">
+ <field name="move_type" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@@ -131,10 +131,10 @@
<record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
<field name="name">stock.picking.journal.view.tree</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_out_tree" />
<field name="arch" type="xml">
- <field name="origin" position="after">
+ <field name="state" position="before">
<field name="invoice_type_id"/>
</field>
</field>
@@ -148,11 +148,54 @@
<page string="Sales & Purchases" position="inside">
<group colspan="2" col="2">
<separator string="Invoicing" colspan="2"/>
- <field name="property_invoice_type" widget="selection"/>
+ <field name="property_invoice_type"/>
</group>
</page>
</field>
</record>
+ <record id="view_sales_order_search" model="ir.ui.view">
+ <field name="name">sale.order.search.inherit</field>
+ <field name="model">sale.order</field>
+ <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+ <field name="arch" type="xml">
+ <xpath expr="//group/filter[@string='Customer']" position="after">
+ <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record id="view_picking_internal_search" model="ir.ui.view">
+ <field name="name">stock.picking.internal.search.inherit</field>
+ <field name="model">stock.picking</field>
+ <field name="inherit_id" ref="stock.view_picking_internal_search"/>
+ <field name="arch" type="xml">
+ <xpath expr="//group/filter[@string='Journal']" position="after">
+ <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record id="view_picking_out_search" model="ir.ui.view">
+ <field name="name">stock.picking.out.search.inherit</field>
+ <field name="model">stock.picking.out</field>
+ <field name="inherit_id" ref="stock.view_picking_out_search"/>
+ <field name="arch" type="xml">
+ <xpath expr="//group/filter[@string='Journal']" position="after">
+ <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record id="view_picking_in_search" model="ir.ui.view">
+ <field name="name">stock.picking.in.search.inherit</field>
+ <field name="model">stock.picking.in</field>
+ <field name="inherit_id" ref="stock.view_picking_in_search"/>
+ <field name="arch" type="xml">
+ <xpath expr="//group/filter[@string='Journal']" position="after">
+ <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+ </xpath>
+ </field>
+ </record>
</data>
</openerp>
_______________________________________________
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
