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

27375 Commits

Author SHA1 Message Date
Deepesh Garg
d066eab6cd fix: Test case for GSTR-3b report 2021-07-26 18:38:50 +05:30
Deepesh Garg
0011585415 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_sales_register_fix 2021-07-26 17:21:13 +05:30
Subin Tom
06fb0b93b5
fix: Supplier invoice importer fix v13 (#26633) 
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
 2021-07-26 16:46:47 +05:30
Frappe PR Bot
4209b3bda9
fix: included company in Link Document Type filters for contact (#26576) (#26634) 
(cherry picked from commit cbddedab7b)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-07-26 13:00:32 +05:30
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation (#26615) 2021-07-24 00:08:02 +05:30
rohitwaghchaure
9052a3b1a8
Merge pull request #26614 from rohitwaghchaure/fixed-serial-no-not-link-to-batch-error 
fix: serial no and batch validation
 2021-07-23 23:38:02 +05:30
rohitwaghchaure
9ef157b23b
fix: wrong operation time in Work Order (#26613) 
* fix: wrong operation time in Work Order

Top level item time operation was not considering the BOM.quantity

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-07-23 20:44:34 +05:30
Deepesh Garg
328444b530 fix(India): Default value for export type 2021-07-23 20:28:02 +05:30
Rohit Waghchaure
45d506c489 fix: serial no and batch validation 2021-07-23 16:40:45 +05:30
rohitwaghchaure
56c67743ab
fix: incorrect bom name (#26600) 2021-07-22 16:10:06 +05:30
Ankush
5b32fa5ccd
fix: SQL error on fetching RM in production plan (bp #26592) 
* fix: SQL error on fetching RM in production plan

* refactor: avoid passing by reference and mutations
 2021-07-22 14:00:01 +05:30
Rohit Waghchaure
f3158ea448 fix: removed Remarks column from AR/AP report 2021-07-21 19:47:41 +05:30
rohitwaghchaure
ac6bfeaa8d
Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report 
fix: incorrect valuation rate calculation in gross profit report
 2021-07-21 19:35:55 +05:30
rohitwaghchaure
f60cba28ab
Merge pull request #26506 from 18alantom/bp-fix-ig-portal-field-filter 
fix: check if field_filters is None
 2021-07-21 11:28:06 +05:30
Rucha Mahabal
57514f7b1d
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427) (#26564) 
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status

* feat: API Endpoint to halt Razorpay subscription

* fix: sider

* fix: validation message

* test: halted razorpay subscription
 2021-07-21 00:46:34 +05:30
Ganga Manoj
41705acbd9
fix: delete child docs when parent doc is deleted (#26518) 
* fix: Make code more readable

* fix: Delete child table info when parent doc is deleted

* fix: Sider issues

* fix: Remove trailing whitespace
 2021-07-20 20:48:57 +05:30
Subin Tom
2d225e621f
fix: Price list rate not fetched for return sales invoice fixed (#26560) 
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
 2021-07-20 20:41:04 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
Suraj Shetty
85c8daae9c fix: Pass doc and other parameters to properly prefill information - while creating customer from form dashboard 2021-07-20 10:24:14 +05:30
Ankush
92273cade0
fix(ux): item description should fall back to name (#26339) (#26552) 
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.

Also fixed wrong condition for erasing description while duplicating
item.
 2021-07-19 20:44:05 +05:30
Devin Slauenwhite
d5ff636159 fix: missing parameter 'country' 2021-07-17 14:42:38 -04:00
Nabin Hait
9ddf33715e
Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item 
fix: added patch to fix missing FG item
 2021-07-16 15:05:23 +05:30
Noah Jacob
3362c080b6
fix: validation check when no conversion_factor (#26527) 2021-07-16 15:00:08 +05:30
Rohit Waghchaure
13e9aa5956 fix: added patch to fix missing FG item 2021-07-16 14:34:24 +05:30
Afshan
9b9b18c286
fix: improving ux for additional discount field (#26502) 2021-07-15 18:11:22 +05:30
Noah Jacob
26a9d38547
fix: WIP needs to be set before submit on skip_transfer (#26500) 2021-07-15 16:50:41 +05:30
Noah Jacob
d319e10883
fix: set default operation time to 0 (#26511) 2021-07-15 16:49:55 +05:30
rohitwaghchaure
4d444559ff
Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item 
fix: FG item not fetched in manufacture entry
 2021-07-15 15:32:05 +05:30
Rohit Waghchaure
74b97b5ec9 fix: FG item not fetched in manufacture entry 2021-07-15 14:52:21 +05:30
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
18alantom
12f7befa13 fix: check if field_filters is None 2021-07-15 12:09:33 +05:30
marination
219623279f fix: Paging buttons not working on item group portal page 2021-07-14 20:50:22 +05:30
18alantom
e244560fb9 fix: set item group as a persistent filter 2021-07-14 17:40:10 +05:30
18alantom
7558e7f115 fix: show child item group items on portal 2021-07-14 17:40:04 +05:30
Noah Jacob
2c67894135
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26487) 
* fix(ux): added filter for valid batch nos.

* fix: not validating batch no if entry type stock reconciliation

* test: validate batch_no
 2021-07-14 16:28:40 +05:30
Kenneth Sequeira
513375f264 fix: Nested/Multi-level BOM help link (#26409) 
Updated the link for multi-level boms. Current link is broken.
 2021-07-14 16:07:47 +05:30
Kenneth Sequeira
7a89033163 fix: update integration links in help.js (#26483) 2021-07-14 16:07:31 +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
Saqib
cbf7e1b676
fix: pos item cart dom updates (#26460) 2021-07-14 11:40:47 +05:30
Anurag Mishra
adfdc71844
fix: Tax calculation for Recurring additional salary (#24206) 
* fix: Tax calculation for Recurring additional salary

* fix: conflicts
 2021-07-14 09:59:41 +05:30
rohitwaghchaure
96eb147bb6
Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue 
fix: multi-currency issue
 2021-07-13 23:01:30 +05:30
Deepesh Garg
75f66f78d7
Merge pull request #26420 from deepeshgarg007/new_company_error 
fix: Errors on parallel requests creation of company for India
 2021-07-13 20:29:56 +05:30
Deepesh Garg
fc20ff02d0
Merge pull request #26418 from deepeshgarg007/gstr_1_json_dpwnload_error 
fix: Unable to download GSTR-1 json
 2021-07-13 16:17:37 +05:30
Deepesh Garg
eef8e4a9d4
Merge pull request #26292 from deepeshgarg007/amended_doc_discount 
fix: Incorrect discount amount on amended document
 2021-07-13 15:34:24 +05:30
Rohit Waghchaure
0d190bb930 fix: multi-currency issue 2021-07-13 15:32:39 +05:30
rohitwaghchaure
84f23ac8d2
Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group 
feat: report to show cogs by item groups
 2021-07-13 11:24:59 +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