Skip to content
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

New fields for acquisitions: Tax (Pr63 in previous non merged repos) #3

Closed
wants to merge 14 commits into from

Conversation

PaulPoulain
Copy link
Member

As asked in pull request ndlibersa/resources#50 , here's a new pull request featuring only the tax fields:

Add new fields to the enhanced acquisitions mode:
    Price Tax Excluded
    Tax Rate
    Price Tax Included

Price Tax Included and Payment Amount will be automatically prefilled accoring
to the Price Tax Excluded and Tax Rate values.

@remocrevo
Copy link
Member

This pull req seems to include the code from pull req #2 (Session Abstraction). @PaulPoulain was this an accident, or did you intend for #2 to be merged first?

@PaulPoulain
Copy link
Member Author

Le 17/03/2016 13:40, remocrevo a écrit :

This pull req seems to include the code from pull req #2
#2 (Session Abstraction).
@PaulPoulain https://github.com/PaulPoulain was this an accident, or
did you intend for #2 #2 to
be merged first?

Yikes... no, it's an accident. I'll fix this ASAP !

Paul Poulain, Associé-gérant / co-owner
BibLibre, Services en logiciels libres pour les bibliothèques
BibLibre, Open Source software and services for libraries

PaulPoulain pushed a commit that referenced this pull request Apr 6, 2016
@jeffnm jeffnm assigned jeffnm and jsavell and unassigned jeffnm Jul 11, 2016
tuxayo added a commit to tuxayo/Coral that referenced this pull request Jul 12, 2016
tuxayo added a commit to tuxayo/Coral that referenced this pull request Jul 12, 2016
fondrenlibrary pushed a commit that referenced this pull request Jul 14, 2016
New Redesigned, Translatable Landing Page / New Auth Module
tuxayo added a commit to tuxayo/Coral that referenced this pull request Jul 21, 2016
tuxayo added a commit to tuxayo/Coral that referenced this pull request Jul 21, 2016
tuxayo added a commit to tuxayo/Coral that referenced this pull request Jul 21, 2016
tuxayo added a commit to tuxayo/Coral that referenced this pull request Jul 21, 2016
tuxayo added a commit to tuxayo/Coral that referenced this pull request Jul 25, 2016
@jsavell
Copy link
Contributor

jsavell commented Aug 10, 2016

I'm closing this request and reopening it as a new PR. Github is registering 14 new commits and intractable merge conflicts when there should only be 3 commits. The other 11 commits contain code that has already been merged into master. A new PR based on the current master branch will resolve this.

@jsavell jsavell closed this Aug 10, 2016
@jsavell jsavell mentioned this pull request Aug 10, 2016
@tuxayo
Copy link
Contributor

tuxayo commented Aug 10, 2016

Github is registering 14 new commits

Sorry, at least 7 of these are unrelated and mine. :-(
I did a typo in the message of one commit (referencing #3 instead of #36).
And after doing various rebases to fix some errors and sync with master, that duplicated the said commit...

tuxayo added a commit to tuxayo/Coral that referenced this pull request Aug 12, 2016
veggiematts pushed a commit to biblibre/Coral that referenced this pull request Nov 17, 2016
jeffnm pushed a commit that referenced this pull request Apr 4, 2018
PHP message: PHP Fatal error:  Uncaught Exception: There was a problem with the database: Expression #5 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'coral_organizations.OHP.parentOrganizationID' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by in /var/www/coral/organizations/admin/classes/common/DBService.php:39
Stack trace:
#0 /var/www/coral/organizations/admin/classes/common/DBService.php(71): DBService->checkForError()
#1 /var/www/coral/organizations/admin/classes/domain/Organization.php(550): DBService->processQuery('SELECT O.organi...', 'assoc')
#2 /var/www/coral/organizations/ajax_htmldata.php(895): Organization->search(Array, 'TRIM(LEADING 'T...', '')
#3 {main}
  thrown in /var/www/coral/organizations/admin/classes/common/DBService.php on line 39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants