Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,732 Commits 3 Branches 0 Tags
Commit Graph

6751 Commits

Author SHA1 Message Date
Anupam K
b3bd780d46 fix: codasy dix 2020-08-13 17:07:15 +05:30
Abhishek Balam
a25760046f fix: condition syntax validation readded, fetch item details if condition not met ignoring rule 2020-08-13 13:22:58 +05:30
Abhishek Balam
487aa30aef fix: eval fail message fix 2020-08-13 12:19:34 +05:30
Deepesh Garg
ca898c6da3 fix: Condition fix 2020-08-13 11:54:18 +05:30
Deepesh Garg
cbde04d3da fix: Pass doc instead of args 2020-08-13 11:47:41 +05:30
prssanna
bfb219612e feat: enable total row in Gross Profit Report 2020-08-13 11:34:05 +05:30
Abhishek Balam
fdfab03c11 feat: add condition field in pricing rule 2020-08-12 20:33:54 +05:30
Nabin Hait
19ea7218d9 fix: Calculate taxes if tax is based on item quantity and inclusive on item price 2020-08-11 20:34:57 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts (#22901) 
* feat: Process Statement Of Accounts initial commit

* fix: add jinja supported inputs for subject and body in email settings

* feat: utils support in template, tested autoemail, fixed issues
 2020-08-11 16:23:47 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return (#22942) 
* feat: adding return naming series

* Update purchase_invoice.json

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-11 16:11:20 +05:30
Afshan
acc3d42cf0
fix: escape apostrophe in company name if exist (#22956) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-11 14:40:44 +05:30
Rucha Mahabal
f7a7cc08d9
Merge branch 'develop' into escape-company-field 2020-08-11 10:22:32 +05:30
sahil28297
4e4a19d3e6
Merge pull request #22984 from saurabh6790/tax-template-issue 
fix: Susbcription in Sales Taxes and Charges Dashboard
 2020-08-10 16:01:35 +05:30
Deepesh Garg
069a54e5c3 fix: Cancellation of accounting transactions within closed accounting period 2020-08-10 16:01:01 +05:30
marination
3beeeb589a fix: Susbcription in Sales Taxes and Charges Dashboard 2020-08-10 15:55:02 +05:30
Saqib Ansari
cc5b49bff4 fix: [pos] minor bugs 2020-08-10 15:52:32 +05:30
Deepesh Garg
372abaa420
Merge pull request #22976 from marination/sales-taxes-dashboard 
fix: Susbcription in Sales Taxes and Charges Dashboard
 2020-08-10 15:17:59 +05:30
marination
0f27500197 fix: Susbcription in Sales Taxes and Charges Dashboard 2020-08-10 15:17:58 +05:30
Saqib Ansari
f1091534cd fix: [pos] minor bugs 2020-08-10 14:45:58 +05:30
Afshan
1f3cc7553c fix: grand_total assigment before reference 2020-08-07 15:57:31 +05:30
Rucha Mahabal
8118dd9e62 fix: escape company field 2020-08-07 14:52:50 +05:30
Raffael Meyer
d854d39c00
fix: show only company's bank accounts 2020-08-06 15:09:22 +02:00
Deepesh Garg
44d62ad0d7
Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref 
fix: condition for checking reference details for Payment Entry
 2020-08-05 23:16:14 +05:30
Suraj Shetty
8d05514260
refactor: Format and sanitise user inputs to search queries. (#22922) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 20:07:30 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Rucha Mahabal
5da067b689 fix: condition for checking reference detail for Payment Entry 2020-08-05 18:18:57 +05:30
Nabin Hait
a042d4721e
fix: Bank Clearance of POS purchase invoice (#22882) 2020-08-03 20:42:15 +05:30
Nabin Hait
a1d3537f2a
fix: Bank Clearance of POS purchase invoice (#22883) 2020-08-03 20:42:00 +05:30
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports (#22888) 2020-08-03 20:41:25 +05:30
Nabin Hait
5e548b4387
Dunning cleanup beta (#22899) 
* fix: Dunning cleanup

* fix: Added dashboard for Dunning
 2020-08-03 20:39:15 +05:30
Nabin Hait
48163e31c5
Dunning cleanup (#22898) 
* fix: Dunning cleanup

* fix: Added dashboard for Dunning
 2020-08-03 20:38:28 +05:30
Rucha Mahabal
b50b20458e
fix: TypeError while concatenating account number and name in COA (#22885) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-08-03 15:51:57 +05:30
Deepesh Garg
2f2de2264d
Merge pull request #22887 from deepeshgarg007/subscription_test 
fix: Test case for subscription
 2020-08-03 14:31:21 +05:30
Deepesh Garg
5572f8eb1e fix: Test case for subscription 2020-08-03 13:40:11 +05:30
Shivam Mishra
de80553d89 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-03 12:34:05 +05:30
Nabin Hait
826158c792
fix: Update modified timestamp in accounts settings (#22874) 2020-08-03 09:34:55 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings (#22873) 2020-08-03 09:33:31 +05:30
Deepesh Garg
01e0d50eba
Merge pull request #22854 from nabinhait/gl-balance-fix 
fix: Ignore cancelled gl entries to get account balance
 2020-07-30 22:15:23 +05:30
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Nabin Hait
38d5c2e04f fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:53:07 +05:30
Nabin Hait
9837285bf1 fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:52:20 +05:30
Marica
c1e46d8131
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-28 12:29:47 +05:30
Deepesh Garg
9119b4c538
fix: Unable to submit backdated stock transactions for different items (#22648) 
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test
 2020-07-28 08:49:44 +05:30
Deepesh Garg
fa28e600b5
fix: Unable to submit backdated stock transactions for different items (#22822) 
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test

* fix: Delete unwanted code
 2020-07-28 08:49:21 +05:30
Anupam K
8718daa11e Adding formatter in budget variance report 2020-07-25 23:56:11 +05:30
Deepesh Garg
c591b77613
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-24 19:04:05 +05:30
Mangesh-Khairnar
762f6297f6
fix(payment-request): do not set guest as administrator (#22804) 2020-07-24 18:05:13 +05:30
Mangesh-Khairnar
8721530b4b
fix(payment-request): do not set guest as administrator (#22801) 2020-07-24 17:19:56 +05:30
Nabin Hait
a8efe8eb5f Merge branch 'develop' into version-13-beta-pre-release 2020-07-24 11:15:13 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report (#22616) 
* fix: buying price for non stock item in gross profit report

* fix: refactor query
 2020-07-24 09:49:17 +05:30