Merge de4cfe1 into 63dc370

OCA · Jun 11, 2015 · ba2a1ec · ba2a1ec
2 parents 63dc370 + de4cfe1
commit ba2a1ec
Show file tree

Hide file tree

Showing 52 changed files with 42 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/__unported__/budget/__init__.py → budget/__init__.py b/__unported__/budget/__init__.py → budget/__init__.py
diff --git a/__unported__/budget/__openerp__.py → budget/__openerp__.py b/__unported__/budget/__openerp__.py → budget/__openerp__.py
@@ -62,6 +62,6 @@
      "test/test_default_end_date.yml",
      "test/test_active_version.yml",
  ],
- "installable": False,
+ "installable": True,
  "application": True,
  }
diff --git a/__unported__/budget/account.py → budget/account.py b/__unported__/budget/account.py → budget/account.py
diff --git a/__unported__/budget/analytic.py → budget/analytic.py b/__unported__/budget/analytic.py → budget/analytic.py
@@ -29,3 +29,11 @@ class account_analytic_account(orm.Model):
                                            'analytic_account_id',
                                            string='Budget Lines'),
     }
+
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        """Remove budget lines when copying analytic account"""
+        if default is None:
+            default = {}
+        default.setdefault('budget_line_ids', False)
+        return super(account_analytic_account, self).copy_data(
+            cr, uid, id, default=default, context=context)
diff --git a/__unported__/budget/analytic_view.xml → budget/analytic_view.xml b/__unported__/budget/analytic_view.xml → budget/analytic_view.xml
diff --git a/__unported__/budget/budget.py → budget/budget.py b/__unported__/budget/budget.py → budget/budget.py
diff --git a/__unported__/budget/budget_item.py → budget/budget_item.py b/__unported__/budget/budget_item.py → budget/budget_item.py
diff --git a/__unported__/budget/budget_line.py → budget/budget_line.py b/__unported__/budget/budget_line.py → budget/budget_line.py
diff --git a/__unported__/budget/budget_version.py → budget/budget_version.py b/__unported__/budget/budget_version.py → budget/budget_version.py
diff --git a/__unported__/budget/budget_view.xml → budget/budget_view.xml b/__unported__/budget/budget_view.xml → budget/budget_view.xml
@@ -360,9 +360,9 @@
           <field name="name">budget item allocation type list</field>
           <field name="model">budget.allocation.type</field>
           <field name="arch" type="xml">
-            <list version="7.0" string="Allocation">
+            <tree string="Allocation">
               <field name="name"/>
-            </list>
+            </tree>
           </field>
         </record>
 
@@ -372,19 +372,22 @@
 
         <!-- ACTION: click on Financial Management/Budgets/Budgets -->
         <record model="ir.actions.act_window" id="open_budget_list">
+            <field name="name">Open Budget List</field>
             <field name="res_model">budget.budget</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
         <!-- ACTION: click on Financial Management/Budgets/Budgets versions -->
         <record model="ir.actions.act_window" id="open_budget_version_list">
+            <field name="name">Open Budget Versions</field>
             <field name="res_model">budget.version</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_budget_version_list_from_menu"/>
         </record>
         <!-- ACTION: click on Financial Management/Budgets/Budgets lines -->
         <record model="ir.actions.act_window" id="open_budget_lines_list">
+            <field name="name">Open Budget Lines</field>
             <field name="res_model">budget.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -393,6 +396,7 @@
         </record>
         <!-- ACTION: click on Financial Management/Budgets/Budgets items -->
         <record model="ir.actions.act_window" id="open_budget_items_list">
+            <field name="name">Open Budget Items</field>
             <field name="res_model">budget.item</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

diff --git a/__unported__/budget/i18n/budget.pot → budget/i18n/budget.pot b/__unported__/budget/i18n/budget.pot → budget/i18n/budget.pot
diff --git a/__unported__/budget/i18n/fr.po → budget/i18n/fr.po b/__unported__/budget/i18n/fr.po → budget/i18n/fr.po
diff --git a/...ted__/budget/security/ir.model.access.csv → budget/security/ir.model.access.csv b/...ted__/budget/security/ir.model.access.csv → budget/security/ir.model.access.csv
diff --git a/__unported__/budget/security/security.xml → budget/security/security.xml b/__unported__/budget/security/security.xml → budget/security/security.xml
diff --git a/__unported__/budget/test/setup_user.yml → budget/test/setup_user.yml b/__unported__/budget/test/setup_user.yml → budget/test/setup_user.yml
diff --git a/...ted__/budget/test/test_active_version.yml → budget/test/test_active_version.yml b/...ted__/budget/test/test_active_version.yml → budget/test/test_active_version.yml
diff --git a/...ed__/budget/test/test_analytic_amount.yml → budget/test/test_analytic_amount.yml b/...ed__/budget/test/test_analytic_amount.yml → budget/test/test_analytic_amount.yml
@@ -2,7 +2,7 @@
   I select for this file a user that is not admin
 -
   !context
-    uid: 'res_users_aurore'
+    uid: 'res_users_beth'
 -
   I first create a budget item
 -

diff --git a/...d__/budget/test/test_default_end_date.yml → budget/test/test_default_end_date.yml b/...d__/budget/test/test_default_end_date.yml → budget/test/test_default_end_date.yml
diff --git a/...d__/budget/test/test_duplicate_budget.yml → budget/test/test_duplicate_budget.yml b/...d__/budget/test/test_duplicate_budget.yml → budget/test/test_duplicate_budget.yml
diff --git a/__unported__/budget_crm/__init__.py → budget_crm/__init__.py b/__unported__/budget_crm/__init__.py → budget_crm/__init__.py
diff --git a/__unported__/budget_crm/__openerp__.py → budget_crm/__openerp__.py b/__unported__/budget_crm/__openerp__.py → budget_crm/__openerp__.py
diff --git a/__unported__/budget_crm/model/__init__.py → budget_crm/model/__init__.py b/__unported__/budget_crm/model/__init__.py → budget_crm/model/__init__.py
diff --git a/__unported__/budget_crm/model/budget_line.py → budget_crm/model/budget_line.py b/__unported__/budget_crm/model/budget_line.py → budget_crm/model/budget_line.py
diff --git a/__unported__/budget_crm/model/company.py → budget_crm/model/company.py b/__unported__/budget_crm/model/company.py → budget_crm/model/company.py
diff --git a/__unported__/budget_crm/model/lead.py → budget_crm/model/lead.py b/__unported__/budget_crm/model/lead.py → budget_crm/model/lead.py
diff --git a/__unported__/budget_crm/model/stage.py → budget_crm/model/stage.py b/__unported__/budget_crm/model/stage.py → budget_crm/model/stage.py
diff --git a/__unported__/budget_crm/model/team.py → budget_crm/model/team.py b/__unported__/budget_crm/model/team.py → budget_crm/model/team.py
diff --git a/...ported__/budget_crm/test/setup_budget.yml → budget_crm/test/setup_budget.yml b/...ported__/budget_crm/test/setup_budget.yml → budget_crm/test/setup_budget.yml
diff --git a/__unported__/budget_crm/test/setup_team.yml → budget_crm/test/setup_team.yml b/__unported__/budget_crm/test/setup_team.yml → budget_crm/test/setup_team.yml
diff --git a/__unported__/budget_crm/test/setup_user.yml → budget_crm/test/setup_user.yml b/__unported__/budget_crm/test/setup_user.yml → budget_crm/test/setup_user.yml
diff --git a/...__/budget_crm/test/test_crm_to_budget.yml → budget_crm/test/test_crm_to_budget.yml b/...__/budget_crm/test/test_crm_to_budget.yml → budget_crm/test/test_crm_to_budget.yml
diff --git a/...__/budget_crm/test/test_lead_defaults.yml → budget_crm/test/test_lead_defaults.yml b/...__/budget_crm/test/test_lead_defaults.yml → budget_crm/test/test_lead_defaults.yml
diff --git a/...et_crm/test/test_update_crm_to_budget.yml → ...et_crm/test/test_update_crm_to_budget.yml b/...et_crm/test/test_update_crm_to_budget.yml → ...et_crm/test/test_update_crm_to_budget.yml
diff --git a/__unported__/budget_crm/view/budget_line.xml → budget_crm/view/budget_line.xml b/__unported__/budget_crm/view/budget_line.xml → budget_crm/view/budget_line.xml
diff --git a/__unported__/budget_crm/view/company.xml → budget_crm/view/company.xml b/__unported__/budget_crm/view/company.xml → budget_crm/view/company.xml
diff --git a/__unported__/budget_crm/view/lead.xml → budget_crm/view/lead.xml b/__unported__/budget_crm/view/lead.xml → budget_crm/view/lead.xml
diff --git a/__unported__/budget_crm/view/stage.xml → budget_crm/view/stage.xml b/__unported__/budget_crm/view/stage.xml → budget_crm/view/stage.xml
diff --git a/__unported__/budget_crm/view/team.xml → budget_crm/view/team.xml b/__unported__/budget_crm/view/team.xml → budget_crm/view/team.xml
@@ -3,7 +3,7 @@
   <data>
 
     <record model="ir.ui.view" id="team_form">
-      <field name="inherit_id" ref="crm.crm_case_section_view_form"/>
+      <field name="inherit_id" ref="sales_team.crm_case_section_view_form"/>
       <field name="model">crm.case.section</field>
       <field name="arch" type="xml">
         <notebook position="inside">

diff --git a/__unported__/budget_crm/wizard/__init__.py → budget_crm/wizard/__init__.py b/__unported__/budget_crm/wizard/__init__.py → budget_crm/wizard/__init__.py
diff --git a/...rted__/budget_crm/wizard/crm_to_budget.py → budget_crm/wizard/crm_to_budget.py b/...rted__/budget_crm/wizard/crm_to_budget.py → budget_crm/wizard/crm_to_budget.py
diff --git a/...ted__/budget_crm/wizard/crm_to_budget.xml → budget_crm/wizard/crm_to_budget.xml b/...ted__/budget_crm/wizard/crm_to_budget.xml → budget_crm/wizard/crm_to_budget.xml
diff --git a/__unported__/budget_invoice/__init__.py → budget_invoice/__init__.py b/__unported__/budget_invoice/__init__.py → budget_invoice/__init__.py
diff --git a/__unported__/budget_invoice/__openerp__.py → budget_invoice/__openerp__.py b/__unported__/budget_invoice/__openerp__.py → budget_invoice/__openerp__.py
diff --git a/...ported__/budget_invoice/model/__init__.py → budget_invoice/model/__init__.py b/...ported__/budget_invoice/model/__init__.py → budget_invoice/model/__init__.py
diff --git a/...ted__/budget_invoice/model/budget_line.py → budget_invoice/model/budget_line.py b/...ted__/budget_invoice/model/budget_line.py → budget_invoice/model/budget_line.py
@@ -46,10 +46,34 @@ def invoice_create(self, cr, uid, ids, product, partner, context=None):
         invoice_id = invoice_obj.create(cr, uid, invoice_data, context)
 
         for budget_line in self.browse(cr, uid, ids, context):
+            product_onchange_result = invoice_line_obj.product_id_change(
+                cr, uid, [],
+                product.id,
+                uom_id=False,
+                qty=0,
+                name=budget_line.name or u'/',
+                type='in_invoice',
+                partner_id=partner.id,
+                fposition_id=False,
+                price_unit=budget_line.amount,
+                currency_id=False,
+                context=context,
+                company_id=(budget_line.analytic_account_id and
+                            budget_line.analytic_account_id.company_id.id or
+                            None),
+            )
             invoice_line_data = {
+                'product_id': product.id,
+                'account_id': product_onchange_result['value']['account_id'],
                 'name': budget_line.name or u'/',
+                'uos_id': product_onchange_result['value']['uos_id'],
                 'price_unit': budget_line.amount,
                 'invoice_id': invoice_id,
+                'invoice_line_tax_id': [
+                    (6, 0,
+                     product_onchange_result['value']['invoice_line_tax_id'])
+                ],
+                'account_analytic_id': budget_line.analytic_account_id.id,
             }
             invoice_line_obj.create(cr, uid, invoice_line_data, context)
 

diff --git a/...ed__/budget_invoice/test/setup_budget.yml → budget_invoice/test/setup_budget.yml b/...ed__/budget_invoice/test/setup_budget.yml → budget_invoice/test/setup_budget.yml
diff --git a/...rted__/budget_invoice/test/setup_user.yml → budget_invoice/test/setup_user.yml b/...rted__/budget_invoice/test/setup_user.yml → budget_invoice/test/setup_user.yml
diff --git a/...nvoice/test/test_invoice_budget_lines.yml → ...nvoice/test/test_invoice_budget_lines.yml b/...nvoice/test/test_invoice_budget_lines.yml → ...nvoice/test/test_invoice_budget_lines.yml
diff --git a/...orted__/budget_invoice/wizard/__init__.py → budget_invoice/wizard/__init__.py b/...orted__/budget_invoice/wizard/__init__.py → budget_invoice/wizard/__init__.py
diff --git a/...oice/wizard/budget_line_invoice_create.py → ...oice/wizard/budget_line_invoice_create.py b/...oice/wizard/budget_line_invoice_create.py → ...oice/wizard/budget_line_invoice_create.py
diff --git a/...ice/wizard/budget_line_invoice_create.xml → ...ice/wizard/budget_line_invoice_create.xml b/...ice/wizard/budget_line_invoice_create.xml → ...ice/wizard/budget_line_invoice_create.xml