-
Notifications
You must be signed in to change notification settings - Fork 65
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
Conversation
- 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.
Conflicts: ajax_forms/getCostForm.php ajax_htmldata/getAcquisitionsDetails.php
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? |
Le 17/03/2016 13:40, remocrevo a écrit :
Paul Poulain, Associé-gérant / co-owner |
New Redesigned, Translatable Landing Page / New Auth Module
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. |
Sorry, at least 7 of these are unrelated and mine. :-( |
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
As asked in pull request ndlibersa/resources#50 , here's a new pull request featuring only the tax fields: