Merge lp:~julie-w/unifield-server/US-7314 into lp:unifield-server/uf17

[jftempo]

=== modified file 'bin/addons/account/project/project.py'
--- bin/addons/account/project/project.py	2019-12-16 11:00:41 +0000
+++ bin/addons/account/project/project.py	2020-07-08 09:16:28 +0000
@@ -28,6 +28,7 @@
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Journal Code', size=8),
+        # the Active tag should not be used anymore from US-7194
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
         'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
         'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
 
=== modified file 'bin/addons/account/project/project_view.xml'
--- bin/addons/account/project/project_view.xml	2020-01-30 10:18:45 +0000
+++ bin/addons/account/project/project_view.xml	2020-07-08 09:16:28 +0000
@@ -330,7 +330,6 @@
                     <field name="name" select="1" default_focus="1"/>
                     <field name="code" select="1" attrs="{'readonly': [('has_ajis', '=', True)]}"/>
                     <field name="type" select="2" attrs="{'readonly': [('has_ajis', '=', True)]}"/>
-                    <field name="active" select="2"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </form>
             </field>
 
=== modified file 'bin/addons/account/report/account_general_ledger.py'
--- bin/addons/account/report/account_general_ledger.py	2020-02-03 14:46:06 +0000
+++ bin/addons/account/report/account_general_ledger.py	2020-07-08 09:16:28 +0000
@@ -225,7 +225,6 @@
             'get_start_period': self.get_start_period,
             'get_end_period': self.get_end_period,
             'get_filter': self._get_filter,
-            'get_sortby': self._get_sortby,
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'get_target_move': self._get_target_move,
@@ -337,10 +336,14 @@
             del counterpart_res'''
             # Then select all account_move_line of this account
 
-            if self.sortby == 'sort_journal_partner':
-                sql_sort='j.code, p.name, l.move_id'
-            else:
-                sql_sort='l.date, l.move_id'
+            if self.sortby == 'sort_third_party':
+                sql_sort = 'l.partner_txt NULLS first, l.move_id'
+            elif self.sortby == 'sort_currency':
+                sql_sort = 'c.name, l.move_id'
+            elif self.sortby == 'sort_reconcile':
+                sql_sort = 'l.reconcile_txt NULLS first, l.move_id'
+            else:  # sort_date by default
+                sql_sort = 'l.date, l.move_id'
             sql = """
                 SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,
                 l.amount_currency,l.ref AS lref, l.name AS lname,
@@ -352,7 +355,7 @@
                 c.symbol AS currency_code,
                 i.id AS invoice_id, i.type AS invoice_type,
                 i.number AS invoice_number,
-                p.name AS partner_name, c.name as currency_name, l.partner_txt as third_party
+                p.name AS partner_name, c.name as currency_name, l.partner_txt as third_party, l.reconcile_txt
                 FROM account_move_line l
                 JOIN account_move m on (l.move_id=m.id)
                 LEFT JOIN res_currency c on (l.currency_id=c.id)
@@ -370,6 +373,8 @@
             if self.init_balance:
                 # US-822: move lines for period 0 IB journal
                 sql_sort = 'l.move_id'
+                if self.sortby == 'sort_currency':  # also sort by currency in case the related option is selected
+                    sql_sort = 'c.name, l.move_id'
                 sql = """
                     SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,
                     l.amount_currency,l.ref AS lref, l.name AS lname,
@@ -381,7 +386,7 @@
                     per.code as period_code, c.symbol AS currency_code,
                     '' AS invoice_id, '' invoice_type,
                     '' AS invoice_number,
-                    '' AS partner_name, c.name as currency_name
+                    '' AS partner_name, c.name as currency_name, l.reconcile_txt
                     FROM account_move_line l
                     JOIN account_move m on (l.move_id=m.id)
                     LEFT JOIN res_currency c on (l.currency_id=c.id)
@@ -416,13 +421,6 @@
             return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id'], context=self.context).company_id.name
         return super(general_ledger ,self)._get_account(data)
 
-    def _get_sortby(self, data):
-        if self.sortby == 'sort_date':
-            return 'Date'
-        elif self.sortby == 'sort_journal_partner':
-            return 'Journal & Partner'
-        return 'Date'
-
     def _get_output_currency_code(self, data):
         return self.output_currency_code or self.currency_name
 
 
=== modified file 'bin/addons/account/report/account_general_ledger_xls.mako'
--- bin/addons/account/report/account_general_ledger_xls.mako	2019-07-31 15:26:10 +0000
+++ bin/addons/account/report/account_general_ledger_xls.mako	2020-07-08 09:16:28 +0000
@@ -132,6 +132,16 @@
   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
 </Borders>
 </Style>
+<Style ss:ID="ssAccountLineRight">
+<Alignment ss:Bottom="Top" ss:WrapText="1" ss:Vertical="Center" ss:Horizontal="Right"/>
+<Font ss:Size="8"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+</Style>
 <Style ss:ID="ssAccountLineColored1">
 <Alignment ss:Bottom="Top" ss:WrapText="1"/>
 <Font ss:Size="8"/>
@@ -201,10 +211,7 @@
 <Column ss:AutoFitWidth="1" ss:Width="55" />
 <Column ss:AutoFitWidth="1" ss:Width="100" ss:Span="1" />
 <Column ss:AutoFitWidth="1" ss:Width="55" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
+<Column ss:Width="90" ss:Span="4" />
 <Row>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">${header_company_or_chart_of_account}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Fiscal Year</Data></Cell>
@@ -213,7 +220,12 @@
 <Cell ss:StyleID="ssH"><Data ss:Type="String">${_('Open Items at')}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Filter By ${(get_filter(data)!='No Filter' and get_filter(data) or '')|x}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Target Moves</Data></Cell>
-<Cell ss:StyleID="ssH" ss:MergeAcross="1"><Data ss:Type="String">Proprietary Instances</Data></Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssH" ss:MergeAcross="2">
+% else:
+    <Cell ss:StyleID="ssH" ss:MergeAcross="1">
+% endif
+<Data ss:Type="String">Proprietary Instances</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
 </Row>
 % for a in objects:
@@ -239,8 +251,12 @@
 <Cell ss:StyleID="ssHeader">
     <Data ss:Type="String">${(get_target_move(data) or '')|x}</Data>
 </Cell>
-<Cell ss:StyleID="ssHeader" ss:MergeAcross="1">
-    <Data ss:Type="String">${(get_prop_instances() or '')|x}</Data>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssHeader" ss:MergeAcross="2">
+% else:
+    <Cell ss:StyleID="ssHeader" ss:MergeAcross="1">
+% endif
+<Data ss:Type="String">${(get_prop_instances() or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssHeader">
     <Data ss:Type="String">${get_output_currency_code(data)}</Data>
@@ -269,6 +285,9 @@
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Credit</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Booking Balance</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Balance ${get_output_currency_code(data)}</Data></Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssH"><Data ss:Type="String">${_('Reconcile Number')}</Data></Cell>
+% endif
 <Cell><Data ss:Type="String"></Data></Cell>
 % if not get_show_move_lines():
 <Cell><Data ss:Type="String"></Data></Cell>
@@ -305,6 +324,9 @@
 <Cell ss:StyleID="ssNumber${ac_style_suffix}">
     <Data ss:Type="Number">${o.data['*']['debit'] - o.data['*']['credit']}</Data>
 </Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssBorder${ac_style_suffix}"><Data ss:Type="String"></Data></Cell>
+% endif
 </Row>
 % endif
 
@@ -333,6 +355,9 @@
     <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
         <Data ss:Type="Number">${o.data[ccy]['debit'] - o.data[ccy]['credit']}</Data>
     </Cell>
+    % if get_show_move_lines():
+        <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}"><Data ss:Type="String"></Data></Cell>
+    % endif
 </Row>
 % endfor
 % endif
@@ -360,13 +385,18 @@
 <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
     <Data ss:Type="Number">${get_line_balance(line, booking=False)}</Data>
 </Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
+        <Data ss:Type="String">${(line.get('reconcile_txt') or '')|x}</Data>
+    </Cell>
+% endif
 </Row>
 % endfor
 
 % for line in lines(o, initial_balance_mode=False):
 <Row>
-<Cell ss:StyleID="ssAccountLine">
-    <Data ss:Type="String"></Data>
+<Cell ss:StyleID="ssAccountLineRight">
+    <Data ss:Type="String">${(o.code or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssAccountLine">
     <Data ss:Type="String">${(line['move'] or '' or '')|x}</Data>
@@ -395,6 +425,9 @@
 <Cell ss:StyleID="ssAccountLineNumber">
     <Data ss:Type="Number">${get_line_balance(line, booking=False)}</Data>
 </Cell>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(line.get('reconcile_txt') or '')|x}</Data>
+</Cell>
 </Row>
 % endfor
 
 
=== modified file 'bin/addons/account/wizard/account_report_general_ledger.py'
--- bin/addons/account/wizard/account_report_general_ledger.py	2017-08-18 09:55:08 +0000
+++ bin/addons/account/wizard/account_report_general_ledger.py	2020-07-08 09:16:28 +0000
@@ -41,7 +41,10 @@
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'is_initial_balance_available': fields.function(_get_fake, method=True, type='boolean', string="Is initial balance filter available ?"),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
-        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
+        'sortby': fields.selection([('sort_date', 'Posting Date'),
+                                    ('sort_third_party', 'Third Party'),
+                                    ('sort_currency', 'Currency'),
+                                    ('sort_reconcile', 'Reconcile Number')], 'Sort by', required=True),
         'output_currency': fields.many2one('res.currency', 'Output Currency', required=True),
         'instance_ids': fields.many2many('msf.instance', 'account_report_general_ledger_instance_rel', 'instance_id', 'argl_id', 'Proprietary Instances'),
         #'export_format': fields.selection([('xls', 'Excel'), ('csv', 'CSV'), ('pdf', 'PDF')], string="Export format", required=True),
@@ -196,7 +199,7 @@
 
         if data['form']['export_format'] \
            and data['form']['export_format'] == 'xls':
-            return { 
+            return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.general.ledger_xls',
                 'datas': data,
 
=== modified file 'bin/addons/account/wizard/account_report_general_ledger_view.xml'
--- bin/addons/account/wizard/account_report_general_ledger_view.xml	2017-08-10 14:19:58 +0000
+++ bin/addons/account/wizard/account_report_general_ledger_view.xml	2020-07-08 09:16:28 +0000
@@ -16,7 +16,6 @@
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="is_initial_balance_available" invisible="1"/>
                 <field name="display_account"/>
-                <field name="sortby" invisible="1" />
                 <field name="initial_balance" attrs="{'readonly':[('is_initial_balance_available', '=', False)]}" />
                 <field name="export_format"/>
                 <newline/>   
@@ -24,7 +23,7 @@
                 <field name="amount_currency" invisible="1" />
                 <newline/>
                 <field name="account_type" />
-                <newline/>
+                <field name="sortby" />
                 <field name="reconciled" />
                 <field name="reconcile_date" />
                 <field name="open_items"/>
 
=== modified file 'bin/addons/account_mcdb/report/combined_journals_report.py'
--- bin/addons/account_mcdb/report/combined_journals_report.py	2019-09-17 12:44:09 +0000
+++ bin/addons/account_mcdb/report/combined_journals_report.py	2020-07-08 09:16:28 +0000
@@ -331,7 +331,7 @@
         for aji in aal_obj.browse(self.cr, self.uid, analytic_line_ids, fields_to_fetch=aji_fields, context=self.context):
             if not aji.move_id:
                 aji_ids.append(aji.id)
-            elif aji.journal_id.type == 'correction':
+            elif aji.journal_id.type in ('correction', 'correction_hq', 'extra'):
                 corrected_aal = aji.last_corrected_id or aji.reversal_origin or False
                 corrected_aml = corrected_aal and corrected_aal.move_id or False
                 if corrected_aml and corrected_aml.last_cor_was_only_analytic and corrected_aml.id == aji.move_id.id:
 
=== modified file 'bin/addons/account_reconciliation/wizard/account_reconcile.py'
--- bin/addons/account_reconciliation/wizard/account_reconcile.py	2019-05-10 14:28:26 +0000
+++ bin/addons/account_reconciliation/wizard/account_reconcile.py	2020-07-08 09:16:28 +0000
@@ -226,15 +226,8 @@
             different_currencies = True
             debit = fdebit
             credit = fcredit
-        # For salaries, behaviour is the same as total_change: we use functional debit/credit
-        if account_id == salary_account_id or (currency_id and currency2_id and not transfer_with_change):
-            if abs(fdebit - fcredit) <= 10**-3:
-                state = 'total'
-            else:
-                state = 'partial'
-                # UF-2050: Do not allow partial reconciliation of entries in different currencies. We ALWAYS do total reconciliation
-                if different_currencies and not transfer_with_change:
-                    state = 'total'
+            # UF-2050: Do not allow partial reconciliation of entries in different currencies. We ALWAYS do total reconciliation
+            state = 'total'
         return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': debit - credit, 'state': state, 'different_currencies': different_currencies}
 
     def total_reconcile(self, cr, uid, ids, context=None):
 
=== modified file 'bin/addons/finance/account_drill.py'
--- bin/addons/finance/account_drill.py	2017-07-06 10:27:39 +0000
+++ bin/addons/finance/account_drill.py	2020-07-08 09:16:28 +0000
@@ -54,7 +54,7 @@
     def get_currencies(self):
         if not self.data:
             return []
-        return [ c for c in self.data.keys() if c != '*' ]
+        return sorted([ c for c in self.data.keys() if c != '*' ])
 
     def output(self):
         """
 
=== modified file 'bin/addons/msf_doc_import/account.py'
--- bin/addons/msf_doc_import/account.py	2020-03-17 16:24:38 +0000
+++ bin/addons/msf_doc_import/account.py	2020-07-08 09:16:28 +0000
@@ -370,6 +370,7 @@
                         r_credit = book_credit
 
                     # Check the journal code which must match with one of the journal types listed in ACCOUNTING_IMPORT_JOURNALS
+                    journal_type = ''
                     if not line[cols['Journal Code']]:
                         errors.append(_('Line %s. No Journal Code specified') % (current_line_num,))
                         continue
@@ -381,7 +382,8 @@
                             continue
                         else:
                             aj_data = aj_obj.read(cr, uid, aj_ids, ['type'])[0]
-                            if aj_data.get('type', False) is False or aj_data.get('type', False) not in ACCOUNTING_IMPORT_JOURNALS:
+                            journal_type = aj_data.get('type', False)
+                            if journal_type is False or journal_type not in ACCOUNTING_IMPORT_JOURNALS:
                                 journal_list = ', '.join([x[1] for x in aj_obj.get_journal_type(cr, uid) if x[0] in ACCOUNTING_IMPORT_JOURNALS])
                                 errors.append(_('Line %s. Import of entries only allowed on the following journal(s): %s') % (current_line_num, journal_list))
                                 continue
@@ -462,6 +464,13 @@
                                         "\"Prevent correction on account codes\".") % (current_line_num, account.code, account.name,))
                         continue
 
+                    if account.type_for_register == 'donation' and journal_type != 'extra':
+                        jtype_value = journal_type and \
+                            dict(aj_obj.fields_get(cr, uid, context=context)['type']['selection']).get(journal_type) or ''
+                        errors.append(_('Line %s. The donation accounts are not compatible with the journal type %s.') %
+                                      (current_line_num, jtype_value))
+                        continue
+
                     # Check analytic axis only if G/L account is analytic-a-holic
                     if account.is_analytic_addicted:
                         # Check Destination
 
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-06-26 12:27:30 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-07-08 09:16:28 +0000
@@ -560,5 +560,14 @@
             <field name="method">us_7631_set_default_liquidity_accounts</field>
         </record>
 
+        <!-- UF18.0 -->
+        <record id="us_7576_sync_msg_from_itself" model="patch.scripts">
+            <field name="method">sync_msg_from_itself</field>
+        </record>
+
+        <record id="us_6544_no_sync_on_forced_out" model="patch.scripts">
+            <field name="method">us_6544_no_sync_on_forced_out</field>
+        </record>
+
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-07-06 08:41:50 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-07-08 09:16:28 +0000
@@ -11816,11 +11816,6 @@
 msgid "Group By"
 msgstr "Grouper par"
 
-#. module: account
-#: selection:account.report.general.ledger,sortby:0
-msgid "Journal & Partner"
-msgstr "Journal et Partenaire"
-
 #. module: account_mcdb
 #: selection:account.mcdb,currency_choice:0
 msgid "Functional"
@@ -12112,7 +12107,7 @@
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
-msgid "Sort By"
+msgid "Sort by"
 msgstr "Trier par"
 
 #. module: product
@@ -37163,7 +37158,6 @@
 #: selection:account.pl.report,filter:0
 #: selection:account.print.journal,filter:0
 #: selection:account.print.journal,sort_selection:0
-#: selection:account.report.general.ledger,sortby:0
 #: field:account.subscription.generate,date:0
 #: field:account.subscription.line,date:0
 #: report:account.tax.code.entries:0
@@ -65008,6 +65002,7 @@
 #: selection:integrity.finance.wizard,filter:0
 #: code:addons/account_override/res_company.py:40
 #: report:addons/account/report/export_invoice.mako:108
+#: selection:account.report.general.ledger,sortby:0
 #, python-format
 msgid "Posting Date"
 msgstr "Date de Comptabilisation"
@@ -78028,6 +78023,7 @@
 #: report:account.general.ledger_landscape:0
 #: report:account.general.ledger_landscape_tb:0
 #: report:addons/account/report/account_general_ledger_xls.mako:247
+#: selection:account.report.general.ledger,sortby:0
 #, python-format
 msgid "Third Party"
 msgstr "Tiers"
@@ -92901,6 +92897,7 @@
 #: report:addons/stock/report/stock_delivery_report_xls.mako:221
 #: report:addons/account/report/export_invoice.mako:96
 #: report:msf.purchase.quotation:0
+#: selection:account.report.general.ledger,sortby:0
 #, python-format
 msgid "Currency"
 msgstr "Devise"
@@ -100630,6 +100627,8 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: report:addons/account/report/account_partner_ledger.mako:310
+#: selection:account.report.general.ledger,sortby:0
+#: report:addons/account/report/account_general_ledger_xls.mako:289
 msgid "Reconcile Number"
 msgstr "Numéro de lettrage"
 
@@ -108042,7 +108041,7 @@
 #. module: procurement_cycle
 #: field:replenishment.segment,order_creation_lt:0
 msgid "Order Creation Lead Time (days)"
-msgstr "Délai de création de commande (jours)"
+msgstr "Délai de Création de Commande (jours)"
 
 #. module: procurement_cycle
 #: report:addons/procurement_cycle/report/replenishment_order_calc.mako:428
@@ -110298,7 +110297,7 @@
 #. module: procurement_cycle
 #: view:replenishment.segment:0
 msgid "Order Creation Lead Time (days) :"
-msgstr "Délai de création de commande (jours) :"
+msgstr "Délai de Création de Commande (jours) :"
 
 #. module: procurement_cycle
 #: view:replenishment.segment:0
@@ -110323,7 +110322,19 @@
 #. module: procurement_cycle
 #: view:replenishment.segment:0
 msgid "Handling Lead Time (days) :"
-msgstr "Délai de traitement (jours) :"
+msgstr "Délai de Manutention (jours) :"
+
+#. module: register_accounting
+#: code:addons/register_accounting/wizard/wizard_register_import.py:495
+#, python-format
+msgid "Line %s. The journal third party used for the internal transfer must be different from the journal of the register."
+msgstr "Ligne %s. Le tiers de type journal utilisé pour le transfert interne doit être différent du journal du registre."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/account.py:470
+#, python-format
+msgid "Line %s. The donation accounts are not compatible with the journal type %s."
+msgstr "Ligne %s. Les comptes de donation ne sont pas compatibles avec le type de journal %s."
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1570
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-06-26 12:27:30 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-07-08 09:16:28 +0000
@@ -52,6 +52,33 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    # UF18.0
+    def sync_msg_from_itself(self, cr, uid, *a, **b):
+        instance = self.pool.get('res.users').browse(cr, uid, uid, fields_to_fetch=['company_id']).company_id.instance_id
+        if not instance:
+            return True
+        cr.execute(''' update sync_client_message_received set run='t', manually_ran='t', log='Set manually to run without execution', manually_set_run_date=now() where run='f' and source=%s ''', (instance.instance, ))
+        self._logger.warn('Set %s self sync messages as Run' % (cr.rowcount,))
+        return True
+
+
+    def us_6544_no_sync_on_forced_out(self, cr, uid, *a, **b):
+        # already forced OUT as delivred must no generate sync msg to prevent NR at reception
+        if self.pool.get('sync_client.version'):
+            cr.execute('''
+                update ir_model_data set sync_date=NOW() where id in (
+                    select d.id from
+                        stock_picking p
+                        left join ir_model_data d on d.model='stock.picking' and d.res_id=p.id and d.module='sd'
+                    where
+                        p.type='out' and
+                        p.subtype='standard' and
+                        p.state='delivered' and
+                        (d.sync_date is null or d.sync_date < d.last_modification)
+            )''')
+            self._logger.warn('Prevent NR on forced delivered OUT (%s)' % (cr.rowcount,))
+        return True
+
     # UF17.1
     def us_7631_set_default_liquidity_accounts(self, cr, uid, *a, **b):
         if self.pool.get('sync_client.version') and self.pool.get('sync.client.entity'):
 
=== modified file 'bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py'
--- bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2019-10-01 09:33:29 +0000
+++ bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2020-07-08 09:16:28 +0000
@@ -281,13 +281,14 @@
                     qty_per_line[line_data['item']] = line_data['qty']
 
                 product = self.get_product(cr, uid, ids, line_data, context=context)
-                self.checks_on_batch(cr, uid, ids, product, line_data, context=context)
-                to_write.update({
-                    'move_id': self.get_matching_move(cr, uid, ids, line_data, product.id, wiz.picking_id.id, treated_lines, context=context)
-                })
-                if not to_write.get('move_id'):
+                move_id = self.get_matching_move(cr, uid, ids, line_data, product.id, wiz.picking_id.id, treated_lines, context=context)
+                if not move_id:
                     continue
                 else:
+                    self.checks_on_batch(cr, uid, ids, product, line_data, context=context)
+                    to_write.update({
+                        'move_id': move_id,
+                    })
                     if line_data['qty_to_process'] > line_data['qty']:
                         raise osv.except_osv(
                             _('Error'),
@@ -334,7 +335,7 @@
         cr.execute("""
             SELECT m.line_number, p.default_code, SUM(product_qty) 
             FROM stock_move m, product_product p
-            WHERE m.product_id = p.id AND m.picking_id = %s AND m.state IN ('confirmed', 'assigned') 
+            WHERE m.product_id = p.id AND m.picking_id = %s AND m.state = 'assigned' 
             GROUP BY m.line_number, p.default_code
         """, (wiz.picking_id.id,))
         for prod in cr.fetchall():
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2020-05-10 10:29:07 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2020-07-08 09:16:28 +0000
@@ -8,7 +8,7 @@
 msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date', 'ir_name_for_sync']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'draft_p', 'cancel'])]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,,Valid
 msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'in_name_goods_return', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok', 'modification_comment', 'from_cancel_out', 'pol_external_ref']","[('order_id.partner_type', '!=', 'external'), ('state', '!=', 'draft'), ('product_uom_qty', '!=', 0.0), '!', '&', ('order_id.fo_created_by_po_sync', '=', False), ('order_id.state', '=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,"[('order_id.state', 'in', ['draft', 'draft_p']), ('order_id.partner_type', 'not in', ['external', 'esc']), ('order_id.client_order_ref', '=', False)]",Valid
 msf_sync_data_server.pol_update_date_expected,TRUE,TRUE,"['sync_local_id', 'sync_linked_pol']","[('id', '=', 0)]",partner_id,MISSION,purchase.order.line.update_date_expected,sale.order.line,Update IN expected date,55,,Valid
-msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'claim', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment', 'move_lines/sale_line_id/id', 'move_lines/sale_line_id/in_name_goods_return', 'sale_id/claim_name_goods_return', 'sale_id/client_order_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,,Valid
+msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'claim', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment', 'move_lines/sale_line_id/id', 'move_lines/sale_line_id/in_name_goods_return', 'sale_id/claim_name_goods_return', 'sale_id/client_order_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', 'in', ['done', 'delivered']), ('already_shipped', '=', True), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,,Valid
 msf_sync_data_server.moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id', 'move_lines/comment']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,,Valid
 msf_sync_data_server.dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'sync_local_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id', 'product_id/default_code', 'comment']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,,Valid
 msf_sync_data_server.closed_in_validates_delivery_out_ship,TRUE,TRUE,"['name', 'state', 'shipment_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'in'),('subtype', 'in', ['standard']), ('state', '=', 'done'), ('shipment_ref', '!=', False), ('dpo_incoming', '=', False)]",partner_id,MISSION,stock.picking.closed_in_validates_delivery_out_ship,stock.picking,Closed IN validates delivery of OUT-SHIP,26,,Valid
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2020-05-25 09:59:55 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2020-07-08 09:16:28 +0000
@@ -21,10 +21,10 @@
 msf_sync_data_server.gl_account_type,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['close_method', 'code', 'name', 'note', 'not_correctible', 'report_type']",OC,account.account.type,,GL Account Type,Valid,,116
 msf_sync_data_server.gl_accounts,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['accrual_account','code', 'default_destination_id/id', 'display_in_reports', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'shrink_entries_for_hq', 'type', 'type_for_register', 'user_type/id', 'currency_revaluation', 'include_in_yearly_move', 'has_partner_type_internal', 'has_partner_type_section', 'has_partner_type_external', 'has_partner_type_esc', 'has_partner_type_intermission', 'has_partner_type_local', 'has_partner_type_ex', 'has_partner_type_book', 'has_partner_type_empty', 'is_not_ad_correctable', 'prevent_multi_curr_rec']",OC,account.account,,GL Accounts,Valid,,117
 msf_sync_data_server.gl_accounts_tree,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('parent_id', '!=', '')]",['parent_id/id'],OC,account.account,,GL Accounts Tree,Valid,,118
-msf_sync_data_server.analytical_journal_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'section')]","['active', 'code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,,Analytical Journal (HQ),Valid,,119
-msf_sync_data_server.analytical_journal_coordo,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'coordo'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Coordo),Valid,,120
-msf_sync_data_server.analytical_journal_project,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('instance_id.level', '=', 'project'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Project),Valid,,121
-msf_sync_data_server.analytical_journal,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['active', 'code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,instance_id,Analytical Journal,Valid,,122
+msf_sync_data_server.analytical_journal_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'section')]","['code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,,Analytical Journal (HQ),Valid,,119
+msf_sync_data_server.analytical_journal_coordo,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'coordo'),('code','!=','ENGI')]","['code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Coordo),Valid,,120
+msf_sync_data_server.analytical_journal_project,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('instance_id.level', '=', 'project'),('code','!=','ENGI')]","['code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Project),Valid,,121
+msf_sync_data_server.analytical_journal,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,instance_id,Analytical Journal,Valid,,122
 msf_sync_data_server.link_accounts_destination,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['account_id/id', 'destination_id/id', 'disabled']",OC,account.destination.link,,Link accounts Destination,Valid,,123
 msf_sync_data_server.funding_pool_to_coordo,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,"[('category' , '=' , 'FUNDING')]","['category', 'code', 'cost_center_ids/id', 'date', 'date_start', 'description', 'instance_id/id', 'name', 'tuple_destination_account_ids/id', 'type']",HQ + MISSION,account.analytic.account,instance_id,Funding Pool linked to a special coordo,Valid,,124
 msf_sync_data_server.fp_tree0,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('category', 'in', ['FREE1', 'FREE2', 'DEST']),('parent_id', '!=', '')]","['parent_id/id', 'instance_id/id']",OC,account.analytic.account,instance_id,"DestF1F2 tree (only F1, F2 and Dest)",Valid,,126
 
=== modified file 'bin/addons/register_accounting/wizard/wizard_register_import.py'
--- bin/addons/register_accounting/wizard/wizard_register_import.py	2020-02-27 16:28:21 +0000
+++ bin/addons/register_accounting/wizard/wizard_register_import.py	2020-07-08 09:16:28 +0000
@@ -491,6 +491,10 @@
                                         if tp_journal.currency.id != register_currency:
                                             errors.append(_('Line %s. A Transfer Same Journal must have the same currency as the register.') % (current_line_num,))
                                             continue
+                                        if tp_journal.id == wiz.register_id.journal_id.id:
+                                            errors.append(_('Line %s. The journal third party used for the internal transfer '
+                                                            'must be different from the journal of the register.') % (current_line_num,))
+                                            continue
                             # Type DP ==> PARTNER required
                             elif type_for_register == 'down_payment':
                                 tp_ids = partner_obj.search(cr, uid, [('name', '=', line[cols['third_party']])], context=context)
 
=== modified file 'bin/addons/sale/report/sale_donation_stock_moves_report.py'
--- bin/addons/sale/report/sale_donation_stock_moves_report.py	2019-10-30 16:33:21 +0000
+++ bin/addons/sale/report/sale_donation_stock_moves_report.py	2020-07-08 09:16:28 +0000
@@ -45,8 +45,10 @@
         Return the moves for the report
         '''
         result = []
-        for move in report.sm_ids:
-            result.append(self.pool.get('stock.move').browse(self.cr, self.uid, move))
+        for move_id in report.sm_ids:
+            move = self.pool.get('stock.move').browse(self.cr, self.uid, move_id)
+            if self._get_qty(move) != 0:
+                result.append(move)
 
         return sorted(result, key=lambda r: (r['date']), reverse=True)
 
 
=== modified file 'bin/addons/sales_followup/report/ir_follow_up_location_report.py'
--- bin/addons/sales_followup/report/ir_follow_up_location_report.py	2019-12-12 13:30:26 +0000
+++ bin/addons/sales_followup/report/ir_follow_up_location_report.py	2020-07-08 09:16:28 +0000
@@ -331,7 +331,7 @@
             # Put the backorderd qty on the first line
             if not lines:
                 continue
-            if bo_qty and bo_qty > 0 and not first_line and line.order_id.state not in ('cancel', 'done'):
+            if bo_qty and bo_qty > 0 and not first_line and line.state not in ('cancel', 'cancel_r', 'done'):
                 lines.append({
                     'po_name': po_name,
                     'cdd': cdd,
 
=== modified file 'bin/addons/stock/report/products_situation_report.py'
--- bin/addons/stock/report/products_situation_report.py	2019-05-10 15:21:38 +0000
+++ bin/addons/stock/report/products_situation_report.py	2020-07-08 09:16:28 +0000
@@ -131,10 +131,12 @@
                 prod_domain.append(('dangerous_goods', '=', report.dangerous_goods))
 
             if report.perishable:
-                prod_domain.append(('perishable', '=', report.perishable))
+                perishable = report.perishable == 'True' and True or report.perishable == 'False' and False or ''
+                prod_domain.append(('perishable', '=', perishable))
 
             if report.batch_management:
-                prod_domain.append(('batch_management', '=', report.batch_management))
+                batch_management = report.batch_management == 'True' and True or report.batch_management == 'False' and False or ''
+                prod_domain.append(('batch_management', '=', batch_management))
 
             prod_ids = prod_obj.search(cr, uid, prod_domain, order='default_code', context=context)
 
 
=== modified file 'bin/osv/expression.py'
--- bin/osv/expression.py	2020-02-28 09:27:51 +0000
+++ bin/osv/expression.py	2020-07-08 09:16:28 +0000
@@ -70,7 +70,7 @@
             raise ValueError('Bad domain expression: %r' % (exp,))
         self.__exp = exp
         self.__field_tables = {}  # used to store the table to use for the sql generation. key = index of the leaf
-        self.__all_tables = set()
+        self.__all_tables = []
         self.__joins = []
         self.__main_table = None # 'root' table. set by parse()
         self.__DUMMY_LEAF = (1, '=', 1) # a dummy leaf that must not be parsed or sql generated
@@ -107,7 +107,8 @@
                 return [(left, 'in', rg(ids, table, parent or table._parent_name))]
 
         self.__main_table = table
-        self.__all_tables.add(table)
+        if table not in self.__all_tables:
+            self.__all_tables.append(table)
 
         i = -1
         while i + 1<len(self.__exp):
@@ -130,7 +131,7 @@
                     working_table = main_table.pool.get(main_table._inherit_fields[fargs[0]][0])
                     if working_table not in self.__all_tables:
                         self.__joins.append('%s.%s=%s.%s' % (working_table._table, 'id', main_table._table, main_table._inherits[working_table._name]))
-                        self.__all_tables.add(working_table)
+                        self.__all_tables.append(working_table)
                     main_table = working_table
 
             field = working_table._columns.get(fargs[0], False)
 
=== modified file 'bin/release.py'
--- bin/release.py	2020-06-26 08:10:24 +0000
+++ bin/release.py	2020-07-08 09:16:28 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = 'UF17.1dev'
+version = 'UF18.0dev'
 major_version = '8.0'
 description = 'OpenERP Server'
 long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic