Merge lp:~julie-w/unifield-server/US-3916 into lp:unifield-server
- US-3916
- Merge into trunk
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 4752 |
Proposed branch: | lp:~julie-w/unifield-server/US-3916 |
Merge into: | lp:unifield-server |
Diff against target: |
357 lines (+114/-24) (has conflicts) 11 files modified
bin/addons/account_corrections/wizard/journal_items_corrections.py (+1/-1) bin/addons/account_hq_entries/account.py (+4/-1) bin/addons/account_hq_entries/account_view.xml (+3/-0) bin/addons/account_hq_entries/hq_entries.py (+24/-0) bin/addons/account_hq_entries/wizard/hq_entries_split.py (+29/-1) bin/addons/account_hq_entries/wizard/wizard_view.xml (+10/-4) bin/addons/account_override/__init__.py (+1/-1) bin/addons/msf_doc_import/account.py (+2/-2) bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py (+2/-2) bin/addons/msf_profile/i18n/fr_MF.po (+36/-10) bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+2/-2) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
To merge this branch: | bzr merge lp:~julie-w/unifield-server/US-3916 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+338555@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bin/addons/account_corrections/wizard/journal_items_corrections.py' |
2 | --- bin/addons/account_corrections/wizard/journal_items_corrections.py 2017-10-27 11:56:53 +0000 |
3 | +++ bin/addons/account_corrections/wizard/journal_items_corrections.py 2018-02-22 14:28:20 +0000 |
4 | @@ -59,7 +59,7 @@ |
5 | if isinstance(ids, (int, long)): |
6 | ids = [ids] |
7 | for line_br in self.browse(cr, uid, ids, context=context): |
8 | - res[line_br.id] = line_br.account_id and line_br.account_id.is_analytic_addicted or False |
9 | + res[line_br.id] = line_br.account_id and line_br.account_id.is_analytic_addicted and not line_br.account_id.is_not_ad_correctable or False |
10 | return res |
11 | |
12 | def _get_is_account_correctible(self, cr, uid, ids, name, args, context=None): |
13 | |
14 | === modified file 'bin/addons/account_hq_entries/account.py' |
15 | --- bin/addons/account_hq_entries/account.py 2013-12-10 09:13:08 +0000 |
16 | +++ bin/addons/account_hq_entries/account.py 2018-02-22 14:28:20 +0000 |
17 | @@ -29,7 +29,10 @@ |
18 | _inherit = 'account.account' |
19 | |
20 | _columns = { |
21 | - 'is_not_hq_correctible': fields.boolean("Can not be corrected on HQ entries", help='If checked, this attribute will prevent user from correcting the account on the entry imported from HQ system'), |
22 | + 'is_not_hq_correctible': fields.boolean("Prevent correction on account codes", |
23 | + help="If checked, this attribute will prevent the user from correcting the account on the entries"), |
24 | + 'is_not_ad_correctable': fields.boolean("Prevent correction on analytic accounts", |
25 | + help="If this option is checked AD correction on this account will be prevented in the HQ entries and via the correction wizard.") |
26 | } |
27 | |
28 | account_account() |
29 | |
30 | === modified file 'bin/addons/account_hq_entries/account_view.xml' |
31 | --- bin/addons/account_hq_entries/account_view.xml 2017-04-20 08:41:54 +0000 |
32 | +++ bin/addons/account_hq_entries/account_view.xml 2018-02-22 14:28:20 +0000 |
33 | @@ -189,6 +189,9 @@ |
34 | <field name="arch" type="xml"> |
35 | <xpath expr="//field[@name='user_type']" position="after"> |
36 | <field name="is_not_hq_correctible"/> |
37 | + <newline/> |
38 | + <label string="" colspan="2"/> |
39 | + <field name="is_not_ad_correctable"/> |
40 | </xpath> |
41 | </field> |
42 | </record> |
43 | |
44 | === modified file 'bin/addons/account_hq_entries/hq_entries.py' |
45 | --- bin/addons/account_hq_entries/hq_entries.py 2017-04-18 08:02:20 +0000 |
46 | +++ bin/addons/account_hq_entries/hq_entries.py 2018-02-22 14:28:20 +0000 |
47 | @@ -475,6 +475,7 @@ |
48 | for line in self.browse(cr, uid, ids): |
49 | if line.account_id_first_value and line.account_id_first_value.is_not_hq_correctible and not account.is_not_hq_correctible: |
50 | raise osv.except_osv(_('Warning'), _('Change Expat salary account is not allowed!')) |
51 | + self.check_ad_change_allowed(cr, uid, ids, vals, context=context) |
52 | return super(hq_entries, self).write(cr, uid, ids, vals, context) |
53 | |
54 | def unlink(self, cr, uid, ids, context=None): |
55 | @@ -542,6 +543,29 @@ |
56 | elif p.number == 12 and not self._is_dec_period_open(cr, uid, context): |
57 | raise mission_closed_except |
58 | |
59 | + def check_ad_change_allowed(self, cr, uid, ids, vals, context=None): |
60 | + """ |
61 | + Raises a warning if the HQ entry Analytic Distribution is about to be modified although the general account is |
62 | + set as "is_not_ad_correctable" |
63 | + :param ids: ids of the HQ Entries |
64 | + :param vals: new values about to be written |
65 | + """ |
66 | + if context is None: |
67 | + context = {} |
68 | + if not context.get('sync_update_execution'): |
69 | + account_obj = self.pool.get('account.account') |
70 | + fields_list = ['account_id', 'cost_center_id', 'free_1_id', 'free_2_id', 'destination_id', 'analytic_id'] |
71 | + for hq_entry in self.browse(cr, uid, ids, fields_to_fetch=fields_list, context=context): |
72 | + account_id = vals.get('account_id') and account_obj.browse(cr, uid, vals['account_id'], fields_to_fetch=['is_not_ad_correctable'], context=context) |
73 | + hq_account = account_id or hq_entry.account_id |
74 | + if hq_account.is_not_ad_correctable: |
75 | + for field in ['cost_center_id', 'destination_id', 'analytic_id', 'free_1_id', 'free_2_id']: |
76 | + value_changed = vals.get(field) and (not getattr(hq_entry, field) or getattr(hq_entry, field).id != vals[field]) |
77 | + value_removed = getattr(hq_entry, field) and field in vals and not vals[field] |
78 | + if value_changed or value_removed: |
79 | + raise osv.except_osv(_('Warning'), _('The account %s - %s is set as \"Prevent correction on' |
80 | + ' analytic accounts\".') % (hq_account.code, hq_account.name)) |
81 | + |
82 | def auto_import(self, cr, uid, file_to_import): |
83 | import base64 |
84 | import os |
85 | |
86 | === modified file 'bin/addons/account_hq_entries/wizard/hq_entries_split.py' |
87 | --- bin/addons/account_hq_entries/wizard/hq_entries_split.py 2016-12-13 10:47:53 +0000 |
88 | +++ bin/addons/account_hq_entries/wizard/hq_entries_split.py 2018-02-22 14:28:20 +0000 |
89 | @@ -53,6 +53,7 @@ |
90 | 'ref': fields.char("Reference", size=255), |
91 | 'account_id': fields.many2one("account.account", "Account", domain=[('type', '!=', 'view')], required=True), |
92 | 'account_hq_correctible': fields.boolean("Is HQ correctible?"), |
93 | + 'is_not_ad_correctable': fields.boolean("Prevent correction on analytic accounts"), |
94 | 'amount': fields.float('Amount', required=True), |
95 | 'destination_id': fields.many2one('account.analytic.account', "Destination", domain=[('category', '=', 'DEST'), ('type', '!=', 'view')], required=True), |
96 | 'cost_center_id': fields.many2one('account.analytic.account', "Cost Center", domain=[('category', '=', 'OC'), ('type', '!=', 'view')], required=True), |
97 | @@ -114,6 +115,17 @@ |
98 | res = getattr(account, 'is_not_hq_correctible', False) |
99 | return res |
100 | |
101 | + def onchange_hq_entry_account(self, cr, uid, ids, account_id): |
102 | + """ |
103 | + Blocks AD correction if the account used is set as 'Prevent correction on analytic accounts' |
104 | + """ |
105 | + account_obj = self.pool.get('account.account') |
106 | + res = {} |
107 | + if account_id: |
108 | + account = account_obj.browse(cr, uid, account_id, fields_to_fetch=['is_not_ad_correctable']) |
109 | + res['value'] = {'is_not_ad_correctable': account.is_not_ad_correctable} |
110 | + return res |
111 | + |
112 | _defaults = { |
113 | 'name': lambda obj, cr, uid, c: obj._get_field(cr, uid, 'name', context=c), |
114 | 'ref': lambda obj, cr, uid, c: obj._get_field(cr, uid, 'ref', context=c), |
115 | @@ -125,6 +137,19 @@ |
116 | 'account_hq_correctible': lambda obj, cr, uid, c: obj._get_hq_correctible(cr, uid, context=c) |
117 | } |
118 | |
119 | + def _update_ad(self, wizard, vals): |
120 | + """ |
121 | + Updates vals dictionary with the AD to use IF it is not retrieved from the wizard because it is readonly. |
122 | + If so the AD is taken from the original entry (use case: account set as is_not_ad_correctable). |
123 | + """ |
124 | + if wizard: |
125 | + for field in ['destination_id', 'cost_center_id', 'analytic_id']: # analytic_id = FP |
126 | + if not vals.get(field): |
127 | + value = getattr(wizard.original_id, field) and getattr(wizard.original_id, field).id or False |
128 | + if not value: |
129 | + raise osv.except_osv(_('Error'), _('The AD of the original entry is incomplete.')) |
130 | + vals[field] = value |
131 | + |
132 | def create(self, cr, uid, vals, context=None): |
133 | """ |
134 | Check that: |
135 | @@ -153,6 +178,7 @@ |
136 | if not account: |
137 | raise osv.except_osv(_('Error'), _('Account is required!')) |
138 | vals['account_id'] = account.id |
139 | + self._update_ad(wiz, vals) |
140 | # US-672/2 |
141 | hq_entry = self._get_original_line(cr, uid, context=context, |
142 | wizard_id=vals.get('wizard_id', False)) |
143 | @@ -199,7 +225,9 @@ |
144 | raise osv.except_osv(_('Error'), _('Negative value is not allowed!')) |
145 | elif original_amount < 0 and vals.get('amount') > 0.0: |
146 | raise osv.except_osv(_('Error'), _('Positive value is not allowed!')) |
147 | - # Prepare some values |
148 | + |
149 | + wizard = self.browse(cr, uid, ids[0], context=context).wizard_id |
150 | + self._update_ad(wizard, vals) |
151 | |
152 | # US-672/2 |
153 | for line in self.browse(cr, uid, ids, context=context): |
154 | |
155 | === modified file 'bin/addons/account_hq_entries/wizard/wizard_view.xml' |
156 | --- bin/addons/account_hq_entries/wizard/wizard_view.xml 2016-07-19 16:06:07 +0000 |
157 | +++ bin/addons/account_hq_entries/wizard/wizard_view.xml 2018-02-22 14:28:20 +0000 |
158 | @@ -42,11 +42,17 @@ |
159 | <field name="name" readonly="1" /> |
160 | <field name="ref"/> |
161 | <field name="account_hq_correctible" invisible="1"/> |
162 | - <field name="account_id" attrs="{'readonly': [('account_hq_correctible', '=', True)]}" domain="[('type', '!=', 'view'), ('restricted_area', '=', 'hq_lines'), ('is_not_hq_correctible', '=', False)]"/> |
163 | + <field name="is_not_ad_correctable" invisible="1"/> |
164 | + <field name="account_id" attrs="{'readonly': [('account_hq_correctible', '=', True)]}" |
165 | + domain="[('type', '!=', 'view'), ('restricted_area', '=', 'hq_lines'), ('is_not_hq_correctible', '=', False)]" |
166 | + on_change="onchange_hq_entry_account(account_id)"/> |
167 | <field name="amount"/> |
168 | - <field name="destination_id"/> |
169 | - <field name="cost_center_id"/> |
170 | - <field name="analytic_id" domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]" string="Funding Pool" context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/> |
171 | + <field name="destination_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/> |
172 | + <field name="cost_center_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}"/> |
173 | + <field name="analytic_id" attrs="{'readonly': [('is_not_ad_correctable', '=', True)]}" |
174 | + domain="[('type', '!=', 'view'), ('category', '=', 'FUNDING'), ('state', '=', 'open'), ('cost_center_ids', '=', cost_center_id)]" |
175 | + string="Funding Pool" |
176 | + context="{'search_default_active': 1, 'hide_inactive': 1, 'date': context.get('document_date')}"/> |
177 | <field name="state"/> |
178 | <field name="state_info"/> |
179 | </tree> |
180 | |
181 | === modified file 'bin/addons/account_override/__init__.py' |
182 | --- bin/addons/account_override/__init__.py 2017-08-18 12:48:57 +0000 |
183 | +++ bin/addons/account_override/__init__.py 2018-02-22 14:28:20 +0000 |
184 | @@ -195,7 +195,7 @@ |
185 | '!', ('code', '=like', '8%'), # UTP-1187 exclude 8/9 accounts |
186 | '!', ('code', '=like', '9%'), # UTP-1187 exclude 8/9 accounts |
187 | ('code', 'not in', ['10100', '10200', '10210']), # UTP-1187 exclude liquidity / cash (10100, 10200, 10210) accounts |
188 | - ('is_not_hq_correctible', '!=', True) # UTP-1187 exclude with the "Can not be corrected on HQ entries" attribute set to "True" accounts |
189 | + ('is_not_hq_correctible', '!=', True) # UTP-1187 exclude the "Prevent correction on account codes" attribute set to "True" accounts |
190 | ], |
191 | } |
192 | |
193 | |
194 | === modified file 'bin/addons/msf_doc_import/account.py' |
195 | --- bin/addons/msf_doc_import/account.py 2017-10-27 12:00:34 +0000 |
196 | +++ bin/addons/msf_doc_import/account.py 2018-02-22 14:28:20 +0000 |
197 | @@ -393,10 +393,10 @@ |
198 | errors.append(_("Line %s. Thirdparty not compatible with account '%s - %s'") % (current_line_num, account.code, account.name, )) |
199 | continue |
200 | |
201 | - # US-3461 Accounts that can't be corrected on HQ entries are not allowed here |
202 | + # US-3461 Accounts that can't be corrected on Account Codes are not allowed here |
203 | if account.is_not_hq_correctible: |
204 | errors.append(_("Line %s. The account \"%s - %s\" cannot be used because it is set as " |
205 | - "\"Can not be corrected on HQ entries\".") % (current_line_num, account.code, account.name,)) |
206 | + "\"Prevent correction on account codes\".") % (current_line_num, account.code, account.name,)) |
207 | continue |
208 | |
209 | # Check analytic axis only if G/L account is analytic-a-holic |
210 | |
211 | === modified file 'bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py' |
212 | --- bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py 2017-06-12 09:46:03 +0000 |
213 | +++ bin/addons/msf_doc_import/wizard/wizard_import_invoice_line.py 2018-02-22 14:28:20 +0000 |
214 | @@ -167,14 +167,14 @@ |
215 | domain.extend(ACCOUNT_RESTRICTED_AREA['intermission_lines']) |
216 | error_domain = _("Line %s: Some restrictions prevent account %s to be used to import this line:\n" |
217 | "- the account cannot be of type 'View'\n" |
218 | - "- account can not be corrected on HQ entries\n" |
219 | + "- account can not be set as 'Prevent correction on account codes'\n" |
220 | "- 'Account Type' should be in ('expense', 'income', 'receivables')\n" |
221 | "- 'P&L / BS Category' cannot be None.") % (line_num, account_value) |
222 | else: |
223 | domain.extend(ACCOUNT_RESTRICTED_AREA['invoice_lines']) |
224 | error_domain = _("Line %s: Some restrictions prevent account %s to be used to import this line:\n" |
225 | "- the account cannot be of type 'View' or 'Liquidity'\n" |
226 | - "- account can not be corrected on HQ entries\n" |
227 | + "- account can not be set as 'Prevent correction on account codes'\n" |
228 | "- 'Type for specific treatment' cannot be 'Donations'\n" |
229 | "- 'Internal Type' should be different from 'Regular' OR 'Account Type' should be different from 'Stock'\n" |
230 | "- 'Account Type' should be different from 'Expense' OR 'P&L / BS Category' not None." |
231 | |
232 | === modified file 'bin/addons/msf_profile/i18n/fr_MF.po' |
233 | --- bin/addons/msf_profile/i18n/fr_MF.po 2018-02-14 10:08:06 +0000 |
234 | +++ bin/addons/msf_profile/i18n/fr_MF.po 2018-02-22 14:28:20 +0000 |
235 | @@ -27275,8 +27275,8 @@ |
236 | |
237 | #. module: account_hq_entries |
238 | #: field:account.account,is_not_hq_correctible:0 |
239 | -msgid "Can not be corrected on HQ entries" |
240 | -msgstr "Impossible à corriger dans les entrées HQ" |
241 | +msgid "Prevent correction on account codes" |
242 | +msgstr "Empêcher toutes corrections sur ce code comptable" |
243 | |
244 | #. module: base_setup |
245 | #: help:base.setup.installer,auction:0 |
246 | @@ -33145,8 +33145,8 @@ |
247 | |
248 | #. module: account_hq_entries |
249 | #: help:account.account,is_not_hq_correctible:0 |
250 | -msgid "If checked, this attribute will prevent user from correcting the account on the entry imported from HQ system" |
251 | -msgstr "If checked, this attribute will prevent user from correcting the account on the entry imported from HQ system" |
252 | +msgid "If checked, this attribute will prevent the user from correcting the account on the entries" |
253 | +msgstr "Si cet attribut est coché, il empêchera l'utilisateur de corriger le compte sur les écritures" |
254 | |
255 | #. module: account_payment |
256 | #: selection:payment.line,state:0 |
257 | @@ -98531,13 +98531,13 @@ |
258 | #, python-format |
259 | msgid "Line %s: Some restrictions prevent account %s to be used to import this line:\n" |
260 | "- the account cannot be of type 'View' or 'Liquidity'\n" |
261 | -"- account can not be corrected on HQ entries\n" |
262 | +"- account can not be set as 'Prevent correction on account codes'\n" |
263 | "- 'Type for specific treatment' cannot be 'Donations'\n" |
264 | "- 'Internal Type' should be different from 'Regular' OR 'Account Type' should be different from 'Stock'\n" |
265 | "- 'Account Type' should be different from 'Expense' OR 'P&L / BS Category' not None." |
266 | msgstr "Ligne %s: Des restrictions empêchent le compte %s d'être utilisé pour importer cette ligne :\n" |
267 | "- le compte ne peut pas être de type 'Vue' ou 'Liquidités'\n" |
268 | -"- compte impossible à corriger dans les entrées HQ\n" |
269 | +"- le compte ne peut pas être défini comme 'Empêcher toutes corrections sur ce code comptable'\n" |
270 | "- 'Type pour traitement spécifique' ne peut pas être 'Donations'\n" |
271 | "- 'Type Interne' doit être différent de 'Normal' OU 'Type de Compte' doit être différent de 'Stock'\n" |
272 | "- 'Type de Compte' doit être différent de 'Expense' OU 'Catégorie Bilan/Cte de Résultat' ne doit pas être vide." |
273 | @@ -98553,12 +98553,12 @@ |
274 | #, python-format |
275 | msgid "Line %s: Some restrictions prevent account %s to be used to import this line:\n" |
276 | "- the account cannot be of type 'View'\n" |
277 | -"- account can not be corrected on HQ entries\n" |
278 | +"- account can not be set as 'Prevent correction on account codes'\n" |
279 | "- 'Account Type' should be in ('expense', 'income', 'receivables')\n" |
280 | "- 'P&L / BS Category' cannot be None." |
281 | msgstr "Ligne %s: Des restrictions empêchent le compte %s d'être utilisé pour importer cette ligne :\n" |
282 | "- le compte ne peut pas être de type 'Vue'\n" |
283 | -"- compte impossible à corriger dans les entrées HQ\n" |
284 | +"- le compte ne peut pas être défini comme 'Empêcher toutes corrections sur ce code comptable'\n" |
285 | "- 'Type de Compte' doit être de type 'expense', 'income' ou 'receivables'\n" |
286 | "- 'Catégorie Bilan/Cte de Résultat' ne doit pas être vide." |
287 | |
288 | @@ -99775,8 +99775,8 @@ |
289 | #. module: msf_doc_import |
290 | #: code:addons/msf_doc_import/account.py:383 |
291 | #, python-format |
292 | -msgid "Line %s. The account \"%s - %s\" cannot be used because it is set as \"Can not be corrected on HQ entries\"." |
293 | -msgstr "Ligne %s. Le compte \"%s - %s\" ne peut pas être utilisé car il est défini comme \"Impossible à corriger dans les entrées HQ\"." |
294 | +msgid "Line %s. The account \"%s - %s\" cannot be used because it is set as \"Prevent correction on account codes\"." |
295 | +msgstr "Ligne %s. Le compte \"%s - %s\" ne peut pas être utilisé car il est défini comme \"Empêcher toutes corrections sur ce code comptable\"." |
296 | |
297 | #. module: msf_homere_interface |
298 | #: code:addons/msf_homere_interface/wizard/hr_payroll_validation.py:147 |
299 | @@ -101225,6 +101225,7 @@ |
300 | #: field:import.commitment.wizard,progress:0 |
301 | msgid "Import in progress" |
302 | msgstr "Import en cours" |
303 | +<<<<<<< TREE |
304 | |
305 | #. module: product_nomenclature |
306 | #: code:addons/product_nomenclature/product_nomenclature.py:742 |
307 | @@ -101246,3 +101247,28 @@ |
308 | #: view:stock.incoming.processor:0 |
309 | msgid "You receive heat sensitive and dangerous goods products, please refer to the appropriate procedure." |
310 | msgstr "Vous recevez des produits dangereux et sensibles à la chaleur, merci de vous référer à la procédure appropriée." |
311 | +======= |
312 | + |
313 | +#. module: account_hq_entries |
314 | +#: field:account.account,is_not_ad_correctable:0 |
315 | +#: field:hq.entries.split.lines,is_not_ad_correctable:0 |
316 | +msgid "Prevent correction on analytic accounts" |
317 | +msgstr "Empêcher la correction sur les comptes analytiques" |
318 | + |
319 | +#. module: account_hq_entries |
320 | +#: help:account.account,is_not_ad_correctable:0 |
321 | +msgid "If this option is checked AD correction on this account will be prevented in the HQ entries and via the correction wizard." |
322 | +msgstr "Si cette option est cochée la correction de la Distribution Analytique sur ce compte sera empêchée dans les Écritures HQ et via l'assistant de correction." |
323 | + |
324 | +#. module: account_hq_entries |
325 | +#: code:addons/account_hq_entries/hq_entries.py:566 |
326 | +#, python-format |
327 | +msgid "The account %s - %s is set as \"Prevent correction on analytic accounts\"." |
328 | +msgstr "Le compte %s - %s est défini comme \"Empêcher la correction sur les comptes analytiques\"." |
329 | + |
330 | +#. module: account_hq_entries |
331 | +#: code:addons/account_hq_entries/wizard/hq_entries_split.py:150 |
332 | +#, python-format |
333 | +msgid "The AD of the original entry is incomplete." |
334 | +msgstr "La Distribution Analytique de l'écriture d'origine est incomplète." |
335 | +>>>>>>> MERGE-SOURCE |
336 | |
337 | === modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv' |
338 | --- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2018-02-20 13:14:40 +0000 |
339 | +++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2018-02-22 14:28:20 +0000 |
340 | @@ -16,7 +16,7 @@ |
341 | msf_sync_data_server.currency_activator,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('active', '!=', ''),('currency_table_id', '!=', ''), ('currency_table_id.state', '=', 'valid')]",['active'],OC,res.currency,,Currency activator,Valid,,114 |
342 | msf_sync_data_server.currency_table_header_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('state','=','valid')]",['state'],OC,res.currency.table,,Currency Table Header State,Valid,,115 |
343 | 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 |
344 | -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' ]",OC,account.account,,GL Accounts,Valid,,117 |
345 | +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']",OC,account.account,,GL Accounts,Valid,,117 |
346 | 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 |
347 | 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 |
348 | msf_sync_data_server.analytical_journal_coordo,TRUE,TRUE,TRUE,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 |
349 | @@ -172,7 +172,7 @@ |
350 | msf_usb_sync_data_server.cp_currency_table_header_state,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('state','=','valid')]",['state'],USB,res.currency.table,,[MASTER] Currency Table Header State,Valid,,1155 |
351 | msf_usb_sync_data_server.cp_currency_rate,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('rate' , '!=' , ''),('currency_id', '!=', ''), ('currency_id', 'in', ('res.currency', 'id', [('active', 'in', ['t', 'f']), ('currency_table_id', '=', '')]))]","['currency_id/id', 'name', 'rate']",USB,res.currency.rate,,[MASTER] Currency Rate,Valid,,1156 |
352 | msf_usb_sync_data_server.cp_gl_account_type,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['close_method', 'code', 'name', 'note', 'report_type']",USB,account.account.type,,[MASTER] GL Account Type,Valid,,1400 |
353 | -msf_usb_sync_data_server.cp_gl_accounts,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['accrual_account','code', 'default_destination_id/id', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', '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' ]",USB,account.account,,[MASTER] GL Accounts,Valid,,1410 |
354 | +msf_usb_sync_data_server.cp_gl_accounts,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['accrual_account','code', 'default_destination_id/id', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', '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']",USB,account.account,,[MASTER] GL Accounts,Valid,,1410 |
355 | msf_usb_sync_data_server.cp_gl_accounts_tree,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],USB,account.account,,[MASTER] GL Accounts Tree,Valid,,1411 |
356 | msf_usb_sync_data_server.cp_analytical_journal_hq,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id.level', '=', 'section')]","['active', 'code', 'name', 'type','instance_id/id']",USB,account.analytic.journal,,[MASTER] Analytical Journal (HQ),Valid,,1420 |
357 | msf_usb_sync_data_server.cp_analytical_journal_coordo,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id.level', '=', 'coordo')]","['active', 'code', 'name', 'type','instance_id/id']",USB,account.analytic.journal,,[MASTER] Analytical Journal (Coordo),Valid,,1421 |