Unifield Server

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

  1. US-4018
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4982
Proposed branch: lp:~julie-w/unifield-server/US-4018
Merge into: lp:unifield-server
Diff against target: 16 lines (+4/-2)
1 file modified
bin/addons/account_override/__init__.py (+4/-2)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4018
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349159@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
1=== modified file 'bin/addons/account_override/__init__.py'
2--- bin/addons/account_override/__init__.py 2018-02-20 10:14:01 +0000
3+++ bin/addons/account_override/__init__.py 2018-07-09 08:36:29 +0000
4@@ -48,8 +48,10 @@
5 #+ Supplier refund
6 'in_invoice': [
7 ('type', '!=', 'view'),
8- # Either Payable/Payables accounts or Regular / Debt accounts
9- '|', '&', ('type', '=', 'payable'), ('user_type_code', '=', 'payables'), '&', ('type', '=', 'other'), ('user_type_code', 'in', ['debt','cash','income']),
10+ # Either Payable/Payables or Payable/Tax or Regular/Debt or Regular/Cash or Regular/Income accounts
11+ '|',
12+ '&', ('type', '=', 'payable'), ('user_type_code', 'in', ['payables', 'tax']),
13+ '&', ('type', '=', 'other'), ('user_type_code', 'in', ['debt', 'cash', 'income']),
14 ('type_for_register', 'not in', ['donation', 'advance', 'transfer', 'transfer_same']),
15 ],
16 # HEADER OF:

Subscribers

People subscribed via source and target branches