Merge lp:~jfb-tempo-consulting/unifield-web/US-4496 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4913
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/US-4496
Merge into: lp:unifield-web
Diff against target: 28 lines (+0/-11)
1 file modified
addons/openerp/controllers/database.py (+0/-11)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/US-4496
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+343626@code.launchpad.net
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
=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py 2018-03-12 15:17:39 +0000
+++ addons/openerp/controllers/database.py 2018-04-19 14:23:38 +0000
@@ -399,8 +399,6 @@
399 ('instance', 'prop_instance_code'),399 ('instance', 'prop_instance_code'),
400 ('reconfigure', 'address_contact_name'),400 ('reconfigure', 'address_contact_name'),
401 ('reconfigure', 'address_street'),401 ('reconfigure', 'address_street'),
402 ('reconfigure', 'address_street2'),
403 ('reconfigure', 'address_zip'),
404 ('reconfigure', 'address_city'),402 ('reconfigure', 'address_city'),
405 ('reconfigure', 'address_country'),403 ('reconfigure', 'address_country'),
406 ('reconfigure', 'address_phone'),404 ('reconfigure', 'address_phone'),
@@ -420,15 +418,6 @@
420 ('partner', 'external_account_payable'),418 ('partner', 'external_account_payable'),
421 ('partner', 'internal_account_receivable'),419 ('partner', 'internal_account_receivable'),
422 ('partner', 'internal_account_payable'),420 ('partner', 'internal_account_payable'),
423 ('company', 'default_counterpart'),
424 ('company', 'salaries_default_account'),
425 ('company', 'rebilling_intersection_account'),
426 ('company', 'intermission_counterpart'),
427 ('company', 'counterpart_bs_debit_balance'),
428 ('company', 'counterpart_bs_crebit_balance'),
429 ('company', 'debit_account_pl_positive'),
430 ('company', 'credit_account_pl_negative'),
431 ('company', 'scheduler_range_days'),
432 )421 )
433 for section, option in not_empty_int_option_list:422 for section, option in not_empty_int_option_list:
434 self.check_mandatory_int(config, section, option)423 self.check_mandatory_int(config, section, option)

Subscribers

People subscribed via source and target branches