Merge pull request mozaik-association#6 from acsone/8.0.3-next-release

8.0.3 next release
acsone · Nov 10, 2015 · 50402aa · 50402aa
2 parents f029a26 + d848eec
commit 50402aa
Show file tree

Hide file tree

Showing 104 changed files with 2,911 additions and 973 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,9 @@
 language: python
+sudo: false
+cache:
+  apt: true
+  directories:
+    - $HOME/.cache/pip
 
 python:
   - "2.7"
@@ -8,28 +13,30 @@ addons:
     packages:
       - expect-dev  # provides unbuffer utility
       - python-lxml # because pip installation is slow
+      - python-simplejson
+      - python-serial
+      - python-yaml
 
 env:
-  - VERSION="8.0" LINT_CHECK="1"
-  - VERSION="8.0" ODOO_REPO="odoo/odoo" EXCLUDE="mozaik_sample_accounting,mozaik_sample_customization" LINT_CHECK="0"
-  - VERSION="8.0" ODOO_REPO="OCA/OCB" EXCLUDE="mozaik_sample_accounting,mozaik_sample_customization" LINT_CHECK="0"
+  global:
+  - VERSION="8.0" TESTS="0" LINT_CHECK="0"
+
+  matrix:
+  - LINT_CHECK="1"
+  - TESTS="1" ODOO_REPO="odoo/odoo" EXCLUDE="mozaik_sample_accounting,mozaik_sample_customization"
+  - TESTS="1" ODOO_REPO="OCA/OCB" EXCLUDE="mozaik_sample_accounting,mozaik_sample_customization"
 
 virtualenv:
   system_site_packages: true
 
 install:
-  - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
   - pip install anybox.testing.openerp phonenumbers unicodecsv
   - travis_install_nightly
-  - git clone https://github.com/acsone/acsone-addons -b ${VERSION} $HOME/acsone-addons
-  - git clone --depth=1 https://github.com/OCA/web -b ${VERSION} $HOME/web
-  - git clone --depth=1 https://github.com/OCA/server-tools -b ${VERSION} $HOME/server-tools
-  - git clone --depth=1 https://github.com/OCA/connector -b ${VERSION} $HOME/connector
-  - git clone --depth=1 https://github.com/OCA/partner-contact -b ${VERSION} $HOME/partner-contact
 
 script:
   - travis_run_tests
 
 after_success:
-  coveralls
+  travis_after_tests_success
diff --git a/mozaik/security/security.xml b/mozaik/security/security.xml
@@ -53,7 +53,7 @@ account.account_comp_rule
         <!-- Pyramidal Confidentiality -->
 
         <record id="sta_selection_committee_base_rule" model="ir.rule">
-            <field name="name">State Selection Committee for Mozaik Base</field>
+            <field name="name">State Selection Committee for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_sta_selection_committee"/>
             <field name="domain_force">[
                 ('designation_int_assembly_id.instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -64,7 +64,7 @@ account.account_comp_rule
         </record>
 
         <record id="int_selection_committee_base_rule" model="ir.rule">
-            <field name="name">Internal Selection Committee for Mozaik Base</field>
+            <field name="name">Internal Selection Committee for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_int_selection_committee"/>
             <field name="domain_force">[
                 ('designation_int_assembly_id.instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -75,7 +75,7 @@ account.account_comp_rule
         </record>
 
         <record id="ext_selection_committee_base_rule" model="ir.rule">
-            <field name="name">External Selection Committee for Mozaik Base</field>
+            <field name="name">External Selection Committee for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_ext_selection_committee"/>
             <field name="domain_force">[
                 ('designation_int_assembly_id.instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -86,7 +86,7 @@ account.account_comp_rule
         </record>
 
         <record id="sta_candidature_base_rule" model="ir.rule">
-            <field name="name">State Candidature for Mozaik Base</field>
+            <field name="name">State Candidature for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_sta_candidature"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -98,7 +98,7 @@ account.account_comp_rule
         </record>
 
         <record id="int_candidature_base_rule" model="ir.rule">
-            <field name="name">Internal Candidature for Mozaik Base</field>
+            <field name="name">Internal Candidature for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_int_candidature"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -110,7 +110,7 @@ account.account_comp_rule
         </record>
 
         <record id="ext_candidature_base_rule" model="ir.rule">
-            <field name="name">External Candidature for Mozaik Base</field>
+            <field name="name">External Candidature for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_ext_candidature"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -122,7 +122,7 @@ account.account_comp_rule
         </record>
 
         <record id="sta_mandate_base_ru_rule" model="ir.rule">
-            <field name="name">State Mandate (RU) for Mozaik Base</field>
+            <field name="name">State Mandate (RU) for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_sta_mandate"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -133,7 +133,7 @@ account.account_comp_rule
         </record>
 
         <record id="sta_mandate_base_cd_rule" model="ir.rule">
-            <field name="name">State Mandate (CD) for Mozaik Base</field>
+            <field name="name">State Mandate (CD) for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_sta_mandate"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -145,7 +145,7 @@ account.account_comp_rule
         </record>
 
         <record id="int_mandate_base_rule" model="ir.rule">
-            <field name="name">Internal Mandate for Mozaik Base</field>
+            <field name="name">Internal Mandate for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_int_mandate"/>
             <field name="domain_force">[
                 '|',
@@ -158,7 +158,7 @@ account.account_comp_rule
         </record>
 
         <record id="ext_mandate_base_ru_rule" model="ir.rule">
-            <field name="name">External Mandate (RU) for Mozaik Base</field>
+            <field name="name">External Mandate (RU) for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_ext_mandate"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -169,7 +169,7 @@ account.account_comp_rule
         </record>
 
         <record id="ext_mandate_base_cd_rule" model="ir.rule">
-            <field name="name">External Mandate (CD) for Mozaik Base</field>
+            <field name="name">External Mandate (CD) for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_ext_mandate"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -181,7 +181,7 @@ account.account_comp_rule
         </record>
 
         <record id="generic_mandate_base_rule" model="ir.rule">
-            <field name="name">Generic Mandate for Mozaik Base</field>
+            <field name="name">Generic Mandate for Mozaik</field>
             <field name="model_id" ref="mozaik_mandate.model_generic_mandate"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),
@@ -192,7 +192,7 @@ account.account_comp_rule
         </record>
 
         <record id="retrocession_base_rule" model="ir.rule">
-            <field name="name">Retrocession for Mozaik Base</field>
+            <field name="name">Retrocession for Mozaik</field>
             <field name="model_id" ref="mozaik_retrocession.model_retrocession"/>
             <field name="domain_force">[
                 ('partner_instance_id','in',user._model.internal_instances(user.env.cr,user.id)),

diff --git a/mozaik_account/account_bank_statement.py b/mozaik_account/account_bank_statement.py
@@ -62,6 +62,12 @@ def _create_membership_move(self, cr, uid, bank_line, reference,
         Method to create account move linked to membership payment
         """
         bsl_obj = self.pool.get('account.bank.statement.line')
+        line_count = bsl_obj.search_count(cr, uid, [('id', '!=', bank_line.id),
+                                                    ('name', '=', reference)],
+                                          context=context)
+        if line_count > 0:
+            # do not auto reconcile if reference has been used previously
+            return
         product_id, price, credit_account = bsl_obj.get_membership_prod_info(
             cr,
             uid,
@@ -150,6 +156,12 @@ def process_reconciliation(self, cr, uid, line_id, mv_line_dicts,
                                context=None, prod_id=None, price=None):
 
         bank_line = self.browse(cr, uid, line_id, context=context)
+        for line in mv_line_dicts:
+            mode, partner_id = self.search_partner_id_with_reference(
+                cr, uid, line.get('name', False), context=context)[0:2]
+            if mode == "membership" and partner_id:
+                line['partner_id'] = partner_id
+
         if not bank_line.partner_id.id:
             raise orm.except_orm(_('No Partner Defined!'),
                                  _("You must first select a partner!"))

diff --git a/mozaik_account/i18n/fr.po b/mozaik_account/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-12 20:10+0000\n"
-"PO-Revision-Date: 2015-03-12 20:10+0000\n"
+"POT-Creation-Date: 2015-10-23 16:04+0000\n"
+"PO-Revision-Date: 2015-10-23 16:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgid "Mandate Category"
 msgstr "Catégorie de mandat"
 
 #. module: mozaik_account
-#: code:addons/mozaik_account/account_bank_statement.py:154
+#: code:addons/mozaik_account/account_bank_statement.py:166
 #, python-format
 msgid "No Partner Defined!"
 msgstr "Aucun partenaire défini !"
@@ -86,7 +86,7 @@ msgid "Templates for Account Chart"
 msgstr "Modèles de plan comptable"
 
 #. module: mozaik_account
-#: code:addons/mozaik_account/account_bank_statement.py:155
+#: code:addons/mozaik_account/account_bank_statement.py:167
 #, python-format
 msgid "You must first select a partner!"
 msgstr "Vous devez selectionner un partenaire !"

diff --git a/mozaik_address/__init__.py b/mozaik_address/__init__.py
@@ -28,5 +28,5 @@
 from . import address_local_street
 from . import address_address
 from . import res_partner
-from . import wizard
 from . import reports
+from . import wizard
diff --git a/mozaik_address/__openerp__.py b/mozaik_address/__openerp__.py
@@ -53,6 +53,8 @@
         'wizard/bounce_editor_view.xml',
         'wizard/export_csv_view.xml',
         'wizard/change_co_residency_address.xml',
+        'wizard/print_postal_from_partner_wizard_view.xml',
+        'reports/report_res_partner_postal_coordinate_label_view.xml',
         'reports/report_postal_coordinate_label_view.xml',
     ],
     'qweb': [

diff --git a/mozaik_address/address_address.py b/mozaik_address/address_address.py
@@ -55,9 +55,6 @@ class address_address(orm.Model):
 
     def _get_technical_name(self, cr, uid, values, context=None):
         """
-        ===================
-        _get_technical_name
-        ===================
         This method produces a technical name with the content of values.
         :type values: dictionary
         :param values: used to create a technical address name
@@ -358,9 +355,6 @@ def onchange_local_street_id(self, cr, uid, ids, local_street_id,
 
     def get_linked_partners(self, cr, uid, ids, context=None):
         """
-        ===================
-        get_linked_partners
-        ===================
         Return all partners ids linked to addresses ids
         :param: ids
         :type: list of addresses ids
@@ -406,11 +400,21 @@ class postal_coordinate(orm.Model):
 
 # public methods
 
+    def name_get(self, cr, uid, ids, context=None):
+        result = super(postal_coordinate, self).name_get(
+            cr, uid, ids, context=context)
+        new_result = []
+        for res in result:
+            data = self.read(cr, uid, res[0], ['co_residency_id'],
+                             context=context)
+            name = res[1]
+            if data['co_residency_id']:
+                name = "%s (%s)" % (name, data['co_residency_id'][1])
+            new_result.append((res[0], name))
+        return new_result
+
     def get_fields_to_update(self, cr, uid, mode, context=None):
         """
-        ====================
-        get_fields_to_update
-        ====================
         :type mode: char
         :param mode: mode defining return values
         :rtype: dictionary
@@ -466,8 +470,14 @@ def name_get(self, cr, uid, ids, context=None):
         ids = isinstance(ids, (long, int)) and [ids] or ids
 
         res = []
-        for record in self.read(cr, uid, ids, ['address_id'], context=context):
-            res.append((record['id'], record['address_id'][1]))
+        for record in self.read(cr, uid, ids, ['line', 'line2'],
+                                context=context):
+            if not record['line'] and not record['line2']:
+                name = _("Co-Residency to complete")
+            else:
+                name = "/".join([line for line in
+                                 [record['line'], record['line2']] if line])
+            res.append((record['id'], name))
         return res
 
     def unlink(self, cr, uid, ids, context=None):

diff --git a/mozaik_address/address_address_view.xml b/mozaik_address/address_address_view.xml
@@ -36,7 +36,7 @@
                 </xpath>
 
                 <xpath expr="//field[@name='active']" position="before">
-                    <field name="co_residency_id" groups="mozaik_base.res_groups_developper"/>
+                    <field name="co_residency_id"/>
                 </xpath>
 
             </field>