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

Pr63 #101

Merged
merged 4 commits into from
Aug 26, 2016
Merged

Pr63 #101

merged 4 commits into from
Aug 26, 2016

Conversation

jsavell
Copy link
Contributor

@jsavell jsavell commented Aug 10, 2016

This is a fresh PR replacing #3

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.

veggiematts and others added 4 commits December 17, 2015 16:33
 - 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
Conflicts:
	resources/ajax_forms/getCostForm.php
	resources/ajax_htmldata/getAcquisitionsDetails.php
	resources/ajax_processing/submitCost.php
	resources/js/forms/costForm.js
@jsavell
Copy link
Contributor Author

jsavell commented Aug 10, 2016

  • When enhancedCostHistory=N in the config, I'm getting javascript errors when I try to add a Cost History entry under acquisitions. I get the same two errors before the re-merge with master and after.

`TypeError: pAmount is undefined

`

SyntaxError: expected expression, got ')' void();

  • The re-merge with master was very involved, and I think other sets of eyes should review the updated code before this PR is merged in.

I stopped testing when I hit the javascript errors.

@veggiematts @PaulPoulain

@fondrenlibrary
Copy link
Contributor

fondrenlibrary commented Aug 11, 2016

Due to a major commit made to the master branch back in June, a key step in the algorithm in While Loop in function validateTable(objRows) in costForm.js is found not correctly established. Instead of directly editing costForm.js in this PR, for your reference, I paste as below the lines in bold to be added/modified/removed. Also, the said changes have been made in #43 .
...
$(".addPayment").click(function () {
duplicateTR.appendTo('.paymentTable');
$('<tr><td colspan="11"><div class="smallDarkRedText div_errorPayment" style="margin:0px 20px 0px 26px;"></div></td></tr>').appendTo('.paymentTable');//can be replaced with a much shorter line.
...
function validateTable(objRows)
{
//var currentRow = 0;
...
//while(typeof objRows[currentRow] !== "undefined")
for (var currentRow = 0; currentRow < objRows.length; currentRow += 2)

{
...
hasNoErrors = false;
}
//currentRow += 2;

@fondrenlibrary
Copy link
Contributor

fondrenlibrary commented Aug 26, 2016

@jsavell , though you see the errors with this pull request, but those errors are not introduced by this pull request. Those errors will be fixed by PR #43 and I have tested locally to support this statement. My test also shows the tax fields function as expected. So I think you can merge this PR now. PR #43 will be merged by us next .

@jsavell jsavell merged commit 7dbcbea into master Aug 26, 2016
@PaulPoulain PaulPoulain added this to the Version 2.0.0 milestone Mar 19, 2018
@t4k t4k deleted the pr63 branch April 6, 2018 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants