-
-
Notifications
You must be signed in to change notification settings - Fork 588
🚑 access error for poses created for different companies #1147
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
KolushovAlexandr
wants to merge
9
commits into
itpp-labs:11.0
Choose a base branch
from
KolushovAlexandr:11.0-pos_ms-wmc-compatibility
base: 11.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a177cb5
:ambulance: access error for poses created for different companies
KolushovAlexandr 7014006
:ambulance: Error during installation in multi-company mode
0d2c3fd
:zap: company rule for multi-session model
KolushovAlexandr 9246a57
:ambulance: expeted singleton error on adding poses to ms
KolushovAlexandr 4354670
:ambulance: empty POS company field on multi-session deleting
KolushovAlexandr 6f6e11f
:ambulance: error on installing the module not from default company
KolushovAlexandr fd72272
:ambulance: current session is undefined when open a pos without set ms
KolushovAlexandr 2744984
:zap: removed block screen on the ms update request
KolushovAlexandr b432eaa
:ambulance: removed block screen during longpolling/update request
KolushovAlexandr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| `4.2.11` | ||
| -------- | ||
|
|
||
| - **Fix:** Access error for poses created for different companies | ||
|
|
||
| `4.2.10` | ||
| -------- | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,6 +88,29 @@ | |
| </div> | ||
| </div> | ||
| </xpath> | ||
| <xpath expr="//field[@name='journal_id']/../../../../.." position="after"> | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Попроще точно ничего нельзя сделать?) |
||
| <h2 attrs="{'invisible': [('is_installed_account_accountant', '=', True)]}">Accounting</h2> | ||
| <div class="row mt16 o_settings_container" attrs="{'invisible': [('is_installed_account_accountant', '=', True)]}"> | ||
| <div class="col-xs-12 col-md-6 o_setting_box"> | ||
| <div class="o_setting_right_pane"> | ||
| <label string="Journal Entries"/> | ||
| <div class="text-muted"> | ||
| Configuration for journal entries of PoS orders | ||
| </div> | ||
| <div class="content-group"> | ||
| <div class="row mt16" title="Whenever you close a session, one entry is generated in the following accounting journal for all the orders not invoiced. Invoices are recorded in accounting separately."> | ||
| <label string="Sales Journal" for="journal_id" class="col-md-3 o_light_label" widget="selection"/> | ||
| <field name="journal_id"/> | ||
| </div> | ||
| <div class="row" groups="account.group_account_user" title="Get one journal item per product rather than one journal item per receipt line. This works for any anonymous order. If the customer is set on the order, one journal item is created for each receipt line. This option is recommended for an easy review of your journal entries when managing lots of orders."> | ||
| <label string="Group Journal Items" for="group_by" class="col-md-3 o_light_label"/> | ||
| <field name="group_by"/> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </xpath> | ||
| </field> | ||
| </record> | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😍