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

6564 Commits

Author SHA1 Message Date
noahjacob
a9ef56a107 test: added test case for creating and updating 2021-08-10 11:41:29 +05:30
noahjacob
415519af15 feat: added multi-select fields to create multiple pricing rules. 2021-08-10 11:41:29 +05:30
Deepesh Garg
cd980f5e6b
Merge pull request #26723 from GangaManoj/backport-po-payment-terms 
feat: Fetch Payment Terms from linked Sales/Purchase Order
 2021-08-10 10:34:39 +05:30
Francisco Roldan
0a90302170 fix: depends_on in price list field 2021-08-09 11:41:56 -03:00
Frappe PR Bot
ea83e2b45f
fix: validate python expressions (#26835) (#26856) 
(cherry picked from commit 07337d5c78c14119ae9fc5d010080a1db61d0bdd)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 14:48:59 +05:30
Deepesh Garg
a59a761f99 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms 2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
Deepesh Garg
6871c07685 test: Failing budget test due to project naming 2021-08-06 10:53:38 +05:30
GangaManoj
232c728636 Revert "fix: Only fetch default Payment Terms Template if present" 
This reverts commit fb80ca9e06ae57dbb61e1a3907b2cfc19b1fd925.
 2021-08-05 23:04:58 +05:30
GangaManoj
fb80ca9e06 fix: Only fetch default Payment Terms Template if present 2021-08-05 22:04:11 +05:30
Frappe PR Bot
6e07ec2617
fix: Do not fetch fully return issued purchase receipts (#26809) (#26825) 
(cherry picked from commit 1d90f7684e0fce8227fb566fa4110b96003d9ee5)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-05 20:13:28 +05:30
GangaManoj
23c104555b fix: Remove irrelevant code 2021-08-05 00:28:42 +05:30
Frappe PR Bot
bf8d0c256d
fix: typo in error message (#26816) (#26817) 
(cherry picked from commit 005291e6dd4088fca23fa36b85f1755510939823)

Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
 2021-08-04 22:01:17 +05:30
Deepesh Garg
db40d88fc2
Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-08-02 21:11:50 +05:30
Subin Tom
6ba11a382a test: Updated test case for Eway bill 2021-08-02 20:36:46 +05:30
Subin Tom
8800aaaee7 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-08-02 20:36:37 +05:30
Frappe PR Bot
a9474a9fbd
fix: POS Invoice consolidated Sales Invoice field set to no copy (#26768) 2021-08-02 12:25:27 +05:30
Saqib
2d6f2fea5b
fix: gl entries for exchange gain loss (#26728) 2021-07-30 10:55:53 +05:30
rohitwaghchaure
bd33bdf210
Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group 
fix: Parent condition in pricing rules
 2021-07-29 19:51:53 +05:30
Ankush
c7df759324
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:12 +05:30
GangaManoj
b389c9e375 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-29 19:25:29 +05:30
GangaManoj
1011c1b01a fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't 2021-07-29 19:24:29 +05:30
Deepesh Garg
19a6d80927 fix: Parent condition in pricing rules 2021-07-29 18:47:16 +05:30
Deepesh Garg
e014d7a00e
Merge pull request #26710 from deepeshgarg007/tds_194q_calculations 
fix: TDS calculation for first threshold breach for TDS category 194Q
 2021-07-29 15:55:16 +05:30
Saqib
e39bbc85e1
fix: cannot cancel payment entry if linked with invoices (#26703) 2021-07-29 15:46:25 +05:30
Deepesh Garg
4c681592bf fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-29 15:26:19 +05:30
Ankush
8859574aab
feat: don't recompute taxes (#26694) 2021-07-29 11:09:22 +05:30
Deepesh Garg
9350249941 fix: Chnage fieldtype from data to check 2021-07-28 12:57:59 +05:30
Deepesh Garg
64af124f88 fix(minor): Consider grand total for threshold check 2021-07-28 10:43:02 +05:30
Nabin Hait
11a1610781
Merge pull request #26661 from deepeshgarg007/tds_enhancements 
feat: Enhancements in Tax Withholding Category
 2021-07-27 18:26:00 +05:30
Deepesh Garg
f28595cad0
Merge pull request #26650 from deepeshgarg007/exchange_rate_reval_fixes_v13 
fix: Exchange rate revaluation posting date and precision fixes
 2021-07-27 16:41:23 +05:30
Deepesh Garg
6e6823c3aa feat: Enhancements in TDS 2021-07-27 10:59:25 +05:30
Deepesh Garg
3fae0db8d9
Merge pull request #26550 from nemesis189/ignore-mandatory-in-payment-reconcilitation-v13 
fix: Ignore mandatory fields while creating payment reconciliation Journal Entry
 2021-07-27 10:15:39 +05:30
Deepesh Garg
dc2cd35b93 fix: Convert null values to empty string on grouping 2021-07-26 19:07:02 +05:30
Deepesh Garg
5749e52bf6 fix: Ignore GL Entry on cancel 2021-07-26 19:06:51 +05:30
Deepesh Garg
fb72df7dce fix: Exchange rate revaluation posting date and precision fixes 2021-07-26 19:06:40 +05:30
Rohit Waghchaure
f3158ea448 fix: removed Remarks column from AR/AP report 2021-07-21 19:47:41 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
Subin Tom
ff9d631f15 fix:Ignore mandatory fields while creating payment reconciliation Journal Entry 2021-07-19 20:28:34 +05:30
Devin Slauenwhite
d5ff636159 fix: missing parameter 'country' 2021-07-17 14:42:38 -04:00
Deepesh Garg
1524e7f5ba
Merge pull request #26412 from deepeshgarg007/payment_entry_taxes_v12 
fix: Unallocated amount in Payment Entry after taxes
 2021-07-15 12:38:23 +05:30
Saqib
ac721ae147
fix: tds computation summary shows cancelled invoices (#26485) 2021-07-14 15:20:14 +05:30
Saqib
9c04079d04
fix: test fails due to improper gain loss account set (#26482) (#26484) 2021-07-14 14:45:11 +05:30
Afshan
9168bb369a
fix: filter by accounts with group by accounts (#26439) 2021-07-14 13:57:14 +05:30
Deepesh Garg
4a2e4748ac fix: Unallocated amount for inclusive charges 2021-07-13 11:22:55 +05:30
Deepesh Garg
30f771b26c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12 2021-07-12 23:34:13 +05:30
Deepesh Garg
855e9030f2 fix: Deduct included taxes from unallocated amount 2021-07-12 22:11:57 +05:30
Saqib
7fb64d1645
fix: exchange gain loss not set for advances linked with invoices (#26436) 2021-07-12 18:33:16 +05:30
Afshan
10473b1195
fix: dunning calculation of grand total when rate of interest is 0% (#26285) 2021-07-12 11:11:29 +05:30
Afshan
bf03671a33
fix(report): iterate on accounts only when accounts exist (#26391) 2021-07-12 11:10:28 +05:30