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

26464 Commits

Author SHA1 Message Date
Saurabh
e7b3047eca chore: Bump version to v13.0.0 2021-04-01 22:59:28 +05:30
Anuja Pawar
87dea3923b
fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List (#25106) 
* fix: picked qty from Stock Qty to Qty in DN

* fix: suggested changes and added test

* fix: sider changes

* fix: sider changes
 2021-04-01 22:05:08 +05:30
Saurabh
f9b9298a6d
fix: reload doc in patch (#25144) 2021-04-01 21:59:35 +05:30
Jannat Patel
c01b2caaa3
fix: serial no refresh issue (#25129) 2021-04-01 20:48:51 +05:30
Afshan
ace4ce64a0
fix: validation msg for TransDocNo e-invoicing (#25121) 2021-04-01 20:28:12 +05:30
Suraj Shetty
c5347c4a34 fix: get_route_options_for_new_doc for project 2021-04-01 19:59:29 +05:30
Nabin Hait
db5f0f79b1
chore: added v13 change log (#25140) 2021-04-01 19:59:02 +05:30
Suraj Shetty
7b97d49a58
Merge pull request #25141 from surajshetty3416/fix-get_route_options_for_new_doc 
fix: get_route_options_for_new_doc for Project
 2021-04-01 19:58:01 +05:30
Suraj Shetty
67169ba2d3 fix: get_route_options_for_new_doc for project 2021-04-01 19:52:07 +05:30
Marica
f46fbcc1ad
Merge pull request #25118 from marination/qc-back-update 
fix: Query values incorrectly escaped while back updating Quality Inspection
 2021-04-01 18:30:58 +05:30
Sagar Vora
d3ee8c7731
fix: customer creation from shopping cart (#25136) 2021-04-01 18:18:19 +05:30
Deepesh Garg
eea20f83ab fix: Add shortfall ratio in Loan Security Shortfall 2021-04-01 18:13:54 +05:30
Rucha Mahabal
0773d6772d
fix(POS): local variable 'customer_currency' referenced before assignment (#25137) 2021-04-01 17:47:19 +05:30
Marica
913e7254cb
Merge branch 'develop' into qc-back-update 2021-04-01 17:40:46 +05:30
Marica
f4e7e72f67
Merge pull request #25131 from marination/qc-back-update-pre-release 
fix: Query values incorrectly escaped while back updating Quality Inspection
 2021-04-01 17:39:56 +05:30
Walstan Baptista
446a6df662
test: set opening stock to fix NegativeStock errors (#25101) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-04-01 16:54:26 +05:30
Sagar Vora
98d250995d
fix(India): create property setters for shorter naming series (#25134) 2021-04-01 16:52:28 +05:30
Sagar Vora
88f5c42b09
test: set formula in scorecard to avoid ValidationError (#25116) 2021-04-01 16:44:05 +05:30
Anuja P
7982688508 fix: sider changes 2021-04-01 16:04:28 +05:30
Walstan Baptista
58625674f4
test: correct naming series to avoid ValidationError (#25132) 2021-04-01 15:55:37 +05:30
marination
a3da206b64 fix: Don't string format args as they may not be escaped properly 
- Append even conditional args to args list and send to query executer
- It will escape all values that are sent to it
- String formatting without escaping causes issues with % sign, etc.
 2021-04-01 15:45:33 +05:30
Marica
9ef323fcfd
Merge branch 'develop' into qc-back-update 2021-04-01 15:44:20 +05:30
Anuja P
45d0b9bce6 test: added tests for Pick List for item with multiple UOM 2021-04-01 15:38:13 +05:30
Sagar Vora
4c31fbb687
fix(India): create property setters for shorter naming series (as per GST Rules) (#25128) 2021-04-01 15:32:37 +05:30
Rucha Mahabal
6717773c28
fix: Travis (#25078) 
* fix(test): set default accounts in mode of payment

* fix(test): import_doc params in shopify settings test

* fix: syntax error in salary slip test

* fix(test): use Temporary Opening account for Stock Reco opening entry

* fix(test): skip GST doc naming validations for tests

* fix(test): Salary Structure Assignment date edge case

* fix(test): GST doc naming validations

* fix: sider

* revert: skip GST doc naming validations for tests
 2021-04-01 15:30:34 +05:30
Nabin Hait
7f7b3608bb fix: merge conflict 2021-04-01 15:05:53 +05:30
Nabin Hait
11eb30d082 fix: merge conflict 2021-04-01 15:03:11 +05:30
Rohit Waghchaure
58ca5a7329 fix: repost not completed backdated transactions 2021-04-01 14:59:49 +05:30
Rucha Mahabal
53a1aaf33d
fix: Salary Structure object has no attribute set_totals (#25113) 2021-04-01 14:40:15 +05:30
Rucha Mahabal
d765b21825
fix: Salary Structure object has no attribute set_totals (#25114) 2021-04-01 14:39:52 +05:30
marination
561fa6b530 fix: Don't string format args as they may not be escaped properly 
- Append even conditional args to args list and send to query executer
- It will escape all values that are sent to it
- String formatting without escaping causes issues with % sign, etc.
 2021-04-01 12:56:05 +05:30
Ankush Menat
1bdf9c4161
fix: patch for purchase receipt status 2021-04-01 11:58:34 +05:30
Ankush Menat
427a98d6cd
fix: do not copy percent billed from PO to PR 2021-04-01 11:51:31 +05:30
Ankush Menat
8993ccb7d2
fix: update PR status in database 2021-04-01 11:51:31 +05:30
Ankush Menat
4198cf58e5
test: add tests for PO->PI, PO->PR workflow 
Add failing test cases for PR status and PR percent billed.
 2021-04-01 11:51:30 +05:30
rohitwaghchaure
56bd4d71a9
Merge pull request #25112 from rohitwaghchaure/fixed-clear-source-warehouse 
fix: not able to save material request
 2021-03-31 23:58:44 +05:30
Rohit Waghchaure
825850a58f fix: not able to save material request 2021-03-31 23:55:06 +05:30
Marica
bfc2590e3b
Merge branch 'develop' into patch-7 2021-03-31 22:23:23 +05:30
Marica
8617c0ab99
Merge pull request #25070 from marination/update-items-bin 
fix: Update Bin via Update Item on Purchase/Sales Order
 2021-03-31 22:21:41 +05:30
Afshan
2fef245607
fix: don't set Company:company:default_currency as default for currency link fields (#25111) 2021-03-31 21:57:04 +05:30
Prssanna Desai
f3c34aa6ae
fix: don't set "Company:company:default_currency" as default for currency link fields (#25095) 
* fix: don't set Company:company:default_currency as default for currency link fields

* fix: Company:company:default_currency and refactor

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-03-31 21:52:48 +05:30
marination
85a7ec91a1 fix: Run Patches to updated Reserved, Requested and Ordered Qty 2021-03-31 21:07:59 +05:30
marination
7665a85039 fix: Run Patches to updated Reserved, Requested and Ordered Qty 2021-03-31 21:03:55 +05:30
Deepesh Garg
9f7bb14ea1 fix: Remove console 2021-03-31 20:01:00 +05:30
Anuja P
a1d0932093 fix: suggested changes 2021-03-31 19:59:28 +05:30
Deepesh Garg
2d86eb3ab1 fix: Hide serial and batch selector in Stock Entry 2021-03-31 19:57:50 +05:30
Ankush Menat
777745f1e0
fix: do not fetch stopped MR in production plan 
- Ignore stopped MR while using fetch button
- Add filter on field inside child table.

Related issue: ISS-20-21-10757
 2021-03-31 19:53:19 +05:30
Anupam Kumar
1033cf72f6
fix: added flag for dont_fetch_price_list_rate in transaction (#25041) 2021-03-31 19:39:45 +05:30
Anupam Kumar
35415fa575
fix: added flag for dont_fetch_price_list_rate in transaction (#25083) 2021-03-31 19:39:33 +05:30
Anuja P
fb9ce3f37b fix: Picked Qty conversion from Stock Qty to item Qty in DN 2021-03-31 19:26:42 +05:30
Prssanna Desai
9920d4062c
Merge pull request #25103 from prssanna/redesign-fixes-v13 2021-03-31 19:02:10 +05:30
Sagar Vora
27f48739d4
test: pass force parameter to avoid LinkExistsError (#25100) 2021-03-31 18:49:03 +05:30
Anupam Kumar
526497bc43
Merge pull request #25104 from anupamvs/purchase-side-margin-beta 
feat: price margin in buying
 2021-03-31 18:38:58 +05:30
Prssanna Desai
e9236ab60f
Merge pull request #25102 from prssanna/pos-print-v13 2021-03-31 18:36:07 +05:30
Sagar Vora
4e07695a08
test: use insert instead of save (#25045) 
* test: use insert instead of save

* test: use do_not_save
 2021-03-31 18:33:27 +05:30
Anupam
ad520e08ba feat: price margin in buying 2021-03-31 18:31:12 +05:30
prssanna
bcd63f04da style: missing semicolon 2021-03-31 18:26:52 +05:30
prssanna
5cdb1cb7a9 fix: item variant dialog dropdown issue 2021-03-31 18:26:45 +05:30
prssanna
56ab3fb132 fix: issue web list style 2021-03-31 18:26:37 +05:30
prssanna
b5843dbdcd fix: print recepit dialog 2021-03-31 18:21:51 +05:30
prssanna
b6ce868199 fix: POS print receipt 2021-03-31 18:21:38 +05:30
Jannat Patel
c814aab0b6
fix: delivery note print error (#25081) 2021-03-31 16:24:31 +05:30
Jannat Patel
11e9ae3841
fix: delivery note print error (#25080) 2021-03-31 16:24:08 +05:30
Prssanna Desai
c5ae9ee0e1
fix: do not set standard link in Sales Invoice as custom (#25097) 2021-03-31 16:16:12 +05:30
Prssanna Desai
45eccfafc1
fix: do not set standard link in Sales Invoice as custom (#25096) 2021-03-31 16:16:00 +05:30
Marica
116ac3cde7
Merge pull request #24863 from marination/drop-shipping 
fix: PO not created against all selected suppliers (drop shipping)
 2021-03-31 16:06:44 +05:30
Deepesh Garg
21a3ea462a
fix: Purchase from registered composition dealer (#25040) 
* fix: Purchase from registered composition dealer

* fix: Test case for GSTR 3b report
 2021-03-31 16:05:12 +05:30
Deepesh Garg
c482c9592f
fix: Purchase from registered composition dealer (#25057) 
* fix: Purchase from registered composition dealer

* fix: Test case for GSTR 3b report
 2021-03-31 16:04:46 +05:30
Marica
1b8d36634f
Merge branch 'develop' into patch-7 2021-03-31 16:04:24 +05:30
Marica
8339987cf1
Merge branch 'develop' into drop-shipping 2021-03-31 16:03:14 +05:30
Saqib
fb4051bddd
feat: discount configuration on early payments (#25089) 
* feat: discount configuration on early payments

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* fix: remove duplicate patch call

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:52:51 +05:30
Saqib
4d0939de8d
feat: introduce parameter group in quality inspection (#25094) 
* feat: introduce parameter group in quality inspection

* chore: make parameter group optional
 2021-03-31 15:51:48 +05:30
rohitwaghchaure
e353c84aa5
Merge pull request #25092 from rohitwaghchaure/fixed-multiply-issue-material-request-develop 
fix: can't multiply sequence by non-int of type 'float'
 2021-03-31 15:31:50 +05:30
rohitwaghchaure
968885af26
Merge pull request #25091 from rohitwaghchaure/fixed-multiply-issue-material-request 
fix: can't multiply sequence by non-int of type 'float'
 2021-03-31 15:31:30 +05:30
Rohit Waghchaure
1bc53a32bf fix: can't multiply sequence by non-int of type 'float' 2021-03-31 15:30:42 +05:30
Rohit Waghchaure
94c145f3c3 fix: can't multiply sequence by non-int of type 'float' 2021-03-31 15:28:26 +05:30
Rohan
99a8cb7143
fix: commit individual SLE rename for large datasets (#25084) 2021-03-31 15:22:00 +05:30
Saqib
f239dbdd03
feat: tax collected at source using tax withholding category (#25090) 
* refactor: tax withholding category against customer

* feat: pan and tax withholding category fields for customer

* fix: test

* feat: charging tcs on sales invoice

* fix: tcs chargable amount

* fix: tcs amount calculation

* fix: sider
 2021-03-31 15:15:29 +05:30
Marica
0af1aedf34
Merge branch 'develop' into drop-shipping 2021-03-31 15:05:11 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments (#24586) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:03:53 +05:30
Saqib
df1ef6f8e5
fix: make round off GLE always non-opening (#25087) 2021-03-31 14:23:09 +05:30
Deepesh Garg
5d73d8281b fix: Remove unintentionally added field 2021-03-31 14:10:56 +05:30
Deepesh Garg
f54d596ae1 fix: Precision issues while allocating advance amoount 2021-03-31 14:06:02 +05:30
rohitwaghchaure
83b3e87497
Merge pull request #25076 from rohitwaghchaure/fixed-bom-stock-calculated-report 
fix: bom stock calculated report
 2021-03-31 13:51:32 +05:30
Afshan
b07de03ddb fix: added blank option for status in report related to issue 2021-03-31 13:39:04 +05:30
marination
59bff8a2f1 fix: Test 
- Preserve order of supplier list while removing duplicates
- Dont use list of set, but list of dict with unique keys
 2021-03-31 13:17:25 +05:30
marination
1b903e39c8 fix: Sider (unused variables) 2021-03-31 13:17:13 +05:30
marination
1999ae0a91 fix: PO not created against all selected suppliers (drop shipping) 
- Return list of created POs instead of first doc
- test case added
 2021-03-31 13:17:00 +05:30
Marica
5a601ce851
Merge branch 'develop' into drop-shipping 2021-03-31 13:12:13 +05:30
Sagar Vora
e50324aed7
perf: reduce number of queries for checking if future SL entry exists (#25064) 2021-03-31 12:44:03 +05:30
Sagar Vora
368cb45147
fix(Italy): setup, validations, optimisations (#25065) 2021-03-31 12:43:33 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Marica
14c44e5e9e
Merge branch 'develop' into drop-shipping 2021-03-31 12:27:32 +05:30
marination
120da991d0 fix: Test 
- Preserve order of supplier list while removing duplicates
- Dont use list of set, but list of dict with unique keys
 2021-03-31 12:27:57 +05:30
Walstan Baptista
353aa59c42
test: sets company while making a project (#25061) 2021-03-31 12:16:54 +05:30
Walstan Baptista
d65458d534
test: corrected item name (#25075) 2021-03-31 12:14:41 +05:30
Rohit Waghchaure
410d36beca fix: bom stock calculated report 2021-03-31 12:11:00 +05:30
Marica
8451da7924
Merge branch 'develop' into drop-shipping 2021-03-31 11:44:07 +05:30
Afshan
91a8a74d54
fix: column width in Recruitment Analytics report (#25074) 2021-03-31 11:30:04 +05:30
Anurag Mishra
720f69caaf
fix: column width in Recruitment analytics report (#25003) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-03-31 11:23:34 +05:30
Anupam
41229ba705 fix: unable to submit stock entry 2021-03-31 02:32:25 +05:30
marination
a5de6c779b fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 02:03:26 +05:30
Andy Zhu
ba3578929e Update accounts_controller.py 
Updating Bin quantity based on doctype to optimize running efficiency.
 2021-03-31 02:03:16 +05:30
Andy Zhu
c0ba6eafd5 fix: Update Items on Purchase Order 
1. set warehouse using `get_item_warehouse`
2. update "reserved_qty" for sales order
 2021-03-31 02:03:10 +05:30
Andy Zhu
a21e347bf1 fix: Update Items on Purchase Order 
If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated.
This fix is not mature yet but to give an tempopary solution for fixing this issue.
 2021-03-31 02:03:02 +05:30
marination
0673f558c1 fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 01:42:18 +05:30
Prssanna Desai
7e442c74b6
Merge pull request #25020 from prssanna/help-links-fix-v13 2021-03-30 19:29:30 +05:30
Marica
c5739957de
Merge branch 'develop' into patch-7 2021-03-30 18:07:32 +05:30
Deepesh Garg
6be78db62c
Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta 
feat: Normal rounding for GST Taxes
 2021-03-30 17:01:45 +05:30
Anurag Mishra
679177f9e0
Merge pull request #25022 from shariquerik/employee-profile-pic-access-fix 
fix: Employee profile pic upload access for erpnext user
 2021-03-30 14:32:21 +05:30
Rucha Mahabal
30f67c3f57
fix: add filters to account link fields in Non Profit Settings (#25060) 
- fetch memberships ordered by date in certificate
 2021-03-30 12:39:56 +05:30
Rucha Mahabal
04c0296558 fix: add filters to account link fields in Non Profit Settings 
- fetch memberships ordered by date in certificate
 2021-03-30 12:30:40 +05:30
Anupam Kumar
9be11afbde
feat: price margin in buying (#25058) 2021-03-30 12:09:46 +05:30
Rucha Mahabal
a54eecb230 fix: membership renewal validation (#24963) 2021-03-30 12:02:52 +05:30
Rucha Mahabal
146cbb10f8 fix: calculate 80g certificate amount on validate for memberships (#24925) 2021-03-30 12:02:28 +05:30
Rucha Mahabal
5f4a2bfc61 fix(Non Profit): Membership and Donation API fixes (#24900) 
* fix: Donation fixes

- differentiate between subscription payment and payment

- issue with donation amount

* fix: existing membership validation

* fix: ignore subscription payments while capturing donations
 2021-03-30 12:02:09 +05:30
Rucha Mahabal
170d2efd35
fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013) 2021-03-30 11:02:46 +05:30
Sagar Vora
7f43c051df fix(Italy): setup, validations, optimisations 2021-03-29 21:18:26 +05:30
Deepesh Garg
f954ec7c78 fix: Add patch for GST category field in Delivery Note 2021-03-29 20:31:11 +05:30
Sagar Vora
ba76f87e44
fix(Italy): setup, validations, optimisations (#25054) 
* fix(Italy): setup, validations, optimisations

* fix: remove unused import
 2021-03-29 20:18:45 +05:30
Deepesh Garg
29997414ad fix: Add GST category field in Dellivery Note 2021-03-29 19:49:52 +05:30
Deepesh Garg
237033704f fix: Add test case 2021-03-29 16:42:59 +05:30
Deepesh Garg
c2548ddc75 feat: Normal rounding for GST Taxes 2021-03-29 16:42:47 +05:30
Saurabh
ceb026c5ab bumped to version 13.0.0-beta.14 2021-03-28 16:14:56 +05:50
rohitwaghchaure
b38ea0cc8b
fix: patch (#25014) 
* fix: patch

* fix: pricing_rule test cases
 2021-03-28 15:51:32 +05:30
Sagar Vora
5c907fa7f0
test: make Stock Entry to avoid NegativeStockError (#25044) 2021-03-27 20:30:26 +05:30
rohitwaghchaure
f4901b4f22
Merge pull request #25034 from anupamvs/naming-pre-release 
fix: unable to submit stock entry
 2021-03-27 19:50:06 +05:30
Walstan Baptista
ee822a9dcd
test: use different product attribute value; cleanup (#25043) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-27 19:42:25 +05:30
Anupam
d429138dcc fix: added flag for dont_fetch_price_list_rate in transaction 2021-03-27 19:31:23 +05:30
Walstan Baptista
d6c7d8e631
test: reset session user if test errors in test_sle (#25042) 2021-03-27 18:30:07 +05:30
Sagar Vora
868c0bf45b
perf: reduce no of queries for checking if future sl entry exists (#24881) 2021-03-27 16:10:20 +05:30
walstanb
ab673d9e4b fix: minor changes 2021-03-27 12:54:49 +05:30
walstanb
225c64a1ad test: sets is_purchase_item while item creation 2021-03-27 12:54:49 +05:30
walstanb
52403c537b fix: check if gst account exists before appending 2021-03-27 12:54:49 +05:30
walstanb
9826ac4602 test: reset session user if test errors 2021-03-27 12:54:49 +05:30
walstanb
98dcf8a1fd fix: type casting for None type value 2021-03-27 12:54:49 +05:30
rohitwaghchaure
6c7f029597
Merge pull request #25016 from hasnain2808/fix-ams-error-v13-pre-release 
fix: ams integration breaks when error raised
 2021-03-27 09:59:51 +05:30
Anupam
4adaf7ed2e Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release 2021-03-27 00:56:48 +05:30
Anupam
5d994d8aa1 fix: unable to submit stock entry 2021-03-27 00:54:19 +05:30
Anupam
096da429ed fix: unable to submit stock entry 2021-03-27 00:45:31 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
Rohit Waghchaure
256b9c7bf9 fix: total weight not set for free items 2021-03-26 19:05:46 +05:30
Rohit Waghchaure
0486276789 fix: don't club same free item 2021-03-26 19:05:45 +05:30
Rohit Waghchaure
fce552b811 fix: nonetype object has no attribute options 2021-03-26 19:05:45 +05:30
Rohit Waghchaure
cd8422a840 feat: recursive product discount 2021-03-26 19:05:43 +05:30
Rucha Mahabal
44853da7c2 feat: Show Required Qty as per BOM in Material Request Items 2021-03-26 18:55:16 +05:30
Rucha Mahabal
4cd68cdecb feat: Add more fields to raw material download 2021-03-26 18:55:08 +05:30
Rucha Mahabal
d74ff72527 fix: Ordered and Reserved Qty for Production not getting fetched in Items 2021-03-26 18:55:00 +05:30
Rucha Mahabal
28a885a3a9 feat: show ordered and reserved qty in Material Request Plan Item table 2021-03-26 18:54:51 +05:30
Rucha Mahabal
efe2b425b1 feat(Production Plan): Consider Safety Stock in Required Qty Calculation 2021-03-26 18:54:34 +05:30
Rucha Mahabal
87a70fe8cb feat: Show Required Qty as per BOM in Material Request Items 2021-03-26 18:37:50 +05:30
Rucha Mahabal
9dbabb92df feat: Add more fields to raw material download 2021-03-26 18:37:40 +05:30
Rucha Mahabal
07409990a0 fix: Ordered and Reserved Qty for Production not getting fetched in Items 2021-03-26 18:37:24 +05:30
Rucha Mahabal
1f86471656 feat: show ordered and reserved qty in Material Request Plan Item table 2021-03-26 18:36:52 +05:30
Rucha Mahabal
66bae19c16 feat(Production Plan): Consider Safety Stock in Required Qty Calculation 2021-03-26 18:36:33 +05:30
shariquerik
82d7986a2f fix: sider fix 2021-03-26 17:02:37 +05:30
Saqib
f66aab6d98
fix: e-invoicing option visible even if settings disabled (#25021) 2021-03-26 16:40:51 +05:30
shariquerik
1989375be4 fix: Employee profile pic upload access for erpnext user 2021-03-26 16:34:22 +05:30
prssanna
5243eea532 style: fix formatting 2021-03-26 15:47:08 +05:30
prssanna
0ae0368d34 fix: re-execute add_standard_navbar_items patch 
- check that same items aren't appended again
 2021-03-26 15:47:07 +05:30
prssanna
eeb3121622 fix: missing help links in navbar help dropdown 2021-03-26 15:47:07 +05:30
Prssanna Desai
3da2df55f4
Merge branch 'develop' into help-links-fix 2021-03-26 15:35:17 +05:30
Sagar Vora
0b569b3e43
fix: allow creating stock entry based on work order for customer provided items (#24885) 2021-03-26 14:40:15 +05:30
prssanna
dd2a315d06 style: fix formatting 2021-03-26 14:35:47 +05:30
hasnain2808@gmail.com
e9c801e4bd fix: ams integration breaks when error raised 2021-03-26 14:32:02 +05:30
Nabin Hait
2a39b74ad2
fix: Fixes on job card and salary slip (#25011) 
* fix: map conversion factor while making stock entry from job card

* fix: fetch additional salary in salary slip
 2021-03-26 10:49:39 +05:30
Marica
ffb4e3f280
Merge pull request #24937 from ankush/hide_alt_field 
fix: hide alt tag if item is not shown in website
 2021-03-25 20:14:52 +05:30
Anurag Mishra
344c14c9ca
Merge pull request #25004 from ruchamahabal/fix-exchange-rate-in-salary-slip 
fix(Payroll): Exchange Rate not getting set in Salary Slip
 2021-03-25 18:12:11 +05:30
Deepesh Garg
74200bcd62
Merge pull request #24975 from frappe/revert-24039-fixed-incorrect-gstr-report-issue 
Revert "fix: GSTR B2C report"
 2021-03-25 16:50:10 +05:30
Deepesh Garg
7b8742bd70
Merge pull request #24998 from frappe/revert-24318-fix-currency-validation-for-party 
Revert "fix: validating party currency with doc currency"
 2021-03-25 16:49:50 +05:30
Rucha Mahabal
b2b12f303e fix(Payroll): Exchange Rate not getting set in Salary Slip 2021-03-25 14:48:08 +05:30
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies (#24988) 2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan
f29c075bc3
fix: patch regional fields for old companies (#24999) 
* fix: patch regional fields for old companies

* chore: fix sider
 2021-03-25 12:56:13 +05:30
Marica
36d125a720
Merge branch 'develop' into item-dashboard-fixes 2021-03-25 12:32:47 +05:30
Nabin Hait
d4499277b4 chore: Added change log 2021-03-25 12:18:22 +05:30
Marica
7c6f72fd39
Merge branch 'develop' into hide_alt_field 2021-03-25 12:15:58 +05:30
Nabin Hait
91026e026f chore: Added change log 2021-03-25 11:53:07 +05:30
Syed Mujeer Hashmi
f8b44e05c4
refactor: Add student mobile number to student attendance (#24990) 
To setup SMS alert notification for student attendance we need student mobile
number in this doctype.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2021-03-25 11:48:29 +05:30
Anupam Kumar
b4e842e25e
fix: opportunity-quotation mapping order status (#25001) 2021-03-25 11:45:57 +05:30
Deepesh Garg
1a6e6320cf Revert "fix: validating party currency with doc currency (#24318)" 
This reverts commit 02142c41bb.
 2021-03-24 21:26:04 +05:30
Prssanna Desai
8a87ffc8f6
fix: POS print receipt (#24924) 
* fix: POS print receipt

* fix: print recepit dialog
 2021-03-24 19:52:39 +05:30
Saqib
dd39a6b47c
fix(pos): mode of payments disappear on loading draft pos invoice (#24917) 2021-03-24 17:56:24 +05:30
prssanna
194dd12882 fix: re-execute add_standard_navbar_items patch 
- check that same items aren't appended again
 2021-03-24 16:45:32 +05:30
prssanna
97aab3ac21 fix: missing help links in navbar help dropdown 2021-03-24 16:44:49 +05:30
Rohit Waghchaure
244f3eeedc fix: incorrect fieldname 2021-03-24 16:42:22 +05:30
Anurag Mishra
4217a4b1ff
Merge branch 'develop' into item-dashboard-fixes 2021-03-24 15:35:33 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning 2021-03-24 15:12:04 +05:30
rohitwaghchaure
3c490088c4
Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre 
fix: repost not completed backdated transactions
 2021-03-24 12:38:42 +05:30
Ishan Loya
de774ae080
Correct state code for 'Other Territory' 
Corrects state code for 'Other Territory' to match e-invoicing state codes list. Attempts to fix #24992
 2021-03-24 12:30:51 +05:30
Rohit Waghchaure
9165327cf6 fix: repost not completed backdated transactions 2021-03-24 11:32:26 +05:30
rohitwaghchaure
575f8f226b
fix: repost not completed backdated transactions (#24980) 2021-03-24 11:30:53 +05:30
Deepesh Garg
734f5c2533
Merge pull request #24971 from deepeshgarg007/loan_security_shortfall_process_update 
fix: Pending shortfall update  on processing loan security shortfall
 2021-03-24 11:24:49 +05:30
Anupam Kumar
5ce0569f80
fix: validate_series (#24984) 2021-03-23 21:13:41 +05:30
Anupam Kumar
5c172044d7
fix: validate_series (#24987) 2021-03-23 21:13:06 +05:30
Deepesh Garg
d26ed25c3e
fix: Period list for exponential smoothing forecasting report (#24983) 2021-03-23 21:11:06 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +05:30
Jannat Patel
d7b139182b
fix: serial no trim issue (#24981) 
* fix: serial no trim issue

* fix: sider
 2021-03-23 21:09:54 +05:30
Jannat Patel
12f0923a61
fix: serial no trim issue (#24949) 
* fix: serial no trim issue

* fix: valid serial nos

* fix: sider

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-03-23 21:09:49 +05:30
Afshan
02142c41bb
fix: validating party currency with doc currency (#24318) 
* fix: validating supplier currency

* fix: compare current currency with company currency as well.

* fix: replaced or with add in condition

* fix: conditioning to get proper payment terms values

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-03-23 20:53:56 +05:30
Syed Mujeer Hashmi
f114da2f67
refactor: Make Discharge Schedule Date as Datetime (#24940) 
* refactor: Make Discharge Schedule Date as Datetime

Like Admitted Datetime make discharge date as discharge datetime.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Add patch for renaming discharge_date to discharge_datetime

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: quote style

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-03-23 17:48:25 +05:30
Anupam
940c75f8ac fix: validate_series 2021-03-23 16:54:54 +05:30
Ankush Menat
2ba198576c
fix: set valuation rate for customer items to zero 
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
 2021-03-23 14:03:09 +05:30
Ankush Menat
2a391298a7
test: customer item in stock reconciliation 2021-03-23 14:03:00 +05:30
Ankush Menat
6a534ea82b
fix: Allow zero valuation in stock reconciliation 
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.

Related issue: ISS-20-21-10248
 2021-03-23 14:02:52 +05:30
Ankush Menat
e76ecb8f74
fix: set valuation rate for customer items to zero 
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
 2021-03-23 13:01:21 +05:30
Ankush Menat
714b780868
test: customer item in stock reconciliation 2021-03-23 12:43:02 +05:30
Ankush Menat
762d6e38f7
fix: Allow zero valuation in stock reconciliation 
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.

Related issue: ISS-20-21-10248
 2021-03-23 11:18:04 +05:30
Marica
e6ad39038e
chore: Allow changing Work Stations in WO. (#24897) 2021-03-23 10:46:03 +05:30
Marica
4ccda9f799
chore: Allow changing Work Stations in WO. (#24898) 2021-03-23 10:45:57 +05:30
Deepesh Garg
ad9b65fcf2
fix: TDS check getting checked after reload (#24972) 2021-03-23 10:45:20 +05:30
Deepesh Garg
d1f15b2a88
fix: TDS check getting checked after reload (#24973) 2021-03-23 10:45:06 +05:30
Rohit Waghchaure
bde159a77d fix: total weight not set for free items 2021-03-22 23:36:48 +05:30
Deepesh Garg
48d5a65ef5 fix: Add test for pending shortfall update 2021-03-22 21:19:19 +05:30
Deepesh Garg
ea487b6c2e
Revert "fix: GSTR B2C report" 2021-03-22 20:54:07 +05:30
Deepesh Garg
f112ce14cf fix: Pending shortfall update on processing loan security shortfall 2021-03-22 18:33:55 +05:30
Anupam
661b1e59c1 Merge branch 'develop' of https://github.com/frappe/erpnext into planning 2021-03-22 11:48:11 +05:30
Anupam
4980dd616b fix: resolving commits 2021-03-22 11:23:47 +05:30
Anuja Pawar
c7c921495b
fix: payment reference on adding cost center in PE and Issue Summary Report error fixes (#24951) 2021-03-22 11:21:15 +05:30
Rucha Mahabal
dffa647071
fix: membership renewal validation (#24963) (#24964) 2021-03-20 22:24:55 +05:30
Rucha Mahabal
5e1cb5e4bc
fix: membership renewal validation (#24963) 2021-03-20 22:22:01 +05:30
Sagar Vora
a85959f574
fix: remove unwanted parameter in calculate_rate_and_amount (#24883) 
* fix: remove unwanted parameter in calculate_rate_and_amount

* fix: translation syntax
 2021-03-20 16:37:33 +05:30
Walstan Baptista
22054044a3
test: created a new user to test warehouse user perms (#24954) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-20 16:35:14 +05:30
Jannat Patel
08855182a3
test: fix test_loan for payroll module (#24946) 
* test: fix test_loan for payroll module

* fix: minor style changes
 2021-03-19 16:34:14 +05:30
rohitwaghchaure
98a40d81d5
Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre 
fix: revert stock balance value calculation
 2021-03-19 16:22:51 +05:30
rohitwaghchaure
081499c0c0
Merge pull request #24956 from rohitwaghchaure/revert-stock-balance-value-calculation-develop 
fix: revert stock balance value calculation
 2021-03-19 16:22:13 +05:30
Rohit Waghchaure
67d94ac0cc fix: revert stock balance value calculation 2021-03-19 16:21:30 +05:30
Rohit Waghchaure
f21a55c8ef fix: revert stock balance value calculation 2021-03-19 16:19:34 +05:30
Deepesh Garg
23af1ed372
Merge pull request #24947 from deepeshgarg007/multi_currency_lcv_issues_v13 
fix: Allow user to update exchange rate in Multi-currency LCV
 2021-03-18 21:21:57 +05:30
Deepesh Garg
b75cbeee4d fix: Allow user to update exchange rate in Multi-currency LCV 2021-03-18 21:20:44 +05:30
Deepesh Garg
9b0a9cc2c0
Merge pull request #24912 from deepeshgarg007/multi_currency_lcv_issues 
fix: Allow user to update exchange rate in Multi-currency LCV
 2021-03-18 21:20:06 +05:30
Deepesh Garg
adcf9a42bd
Merge pull request #24916 from deepeshgarg007/nil_exempt_gstr_3b 
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
 2021-03-18 21:02:51 +05:30
Deepesh Garg
a5de22cb8e
Merge pull request #24918 from deepeshgarg007/nil_exempt_gstr_3b_v13 
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
 2021-03-18 21:02:41 +05:30
Walstan Baptista
6df61d217f
test: created a new user to test child perms (#24943) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-18 19:23:59 +05:30
Sagar Vora
6ac11a04b0
test: added warehouse for TCS Item as it is a Stock Item (#24942) 2021-03-18 18:07:21 +05:30
Sagar Vora
8ee1146f72
test: add stock to avoid NegativeStockError (#24941) 2021-03-18 17:45:25 +05:30
Afshan
a04091aaf7
fix: exclude current doc while validation. (#24914) 2021-03-18 16:40:43 +05:30
Sagar Vora
b134b89fb0
test: fix NegativeStockError (#24936) 2021-03-18 16:36:40 +05:30
Sagar Vora
78e576ee6a
fix: default total_estimated_cost to zero (#24939) 
Co-authored-by: walstanb <walstanb@gmail.com>
 2021-03-18 15:23:52 +05:30
Ankush Menat
c0a9c391eb
fix: hide alt tag if item is not shown in website 2021-03-18 14:07:24 +05:30
Deepesh Garg
d39055785a
Merge pull request #24934 from Anuja-pawar/fix_report_issue_summary 
fix: Report Issue Summary fix for zero issues
 2021-03-18 12:24:43 +05:30
Anuja Pawar
9bf1083d9e
fix: payment references from disappearing on selecting cost center (#24831) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-03-18 11:22:24 +05:30
Rushabh Mehta
14c3c5172d fix(minor): rearrange the cards on home workspace 2021-03-18 10:45:38 +05:30
Anuja P
2c8a38d9fa fix: report issue summary fix for zero issues 2021-03-18 10:36:46 +05:30
Sagar Vora
500f54e515
test: fix shift type not found (#24929) 2021-03-17 23:25:04 +05:30
Sagar Vora
52bbd4e182
test: clear Leave Period before running Leave Allocation tests (#24928) 2021-03-17 22:37:59 +05:30
Sagar Vora
7645315424
test: set correct qty when creating subcontract transfer entry (#24903) 2021-03-17 20:01:21 +05:30
Sagar Vora
95e9b2fd6e
refactor(payroll): simplified logic for additional salary (#24907) 2021-03-17 19:58:56 +05:30
Sagar Vora
f4a6c7823a
test: create new item instead of using _Test Item to prevent error (#24915) 2021-03-17 19:57:53 +05:30
Sagar Vora
cf3fc99b12
test: fix salary component not found; other optimisation (#24920) 2021-03-17 19:54:08 +05:30
Rucha Mahabal
bacfaa4396
fix: calculate 80g certificate amount on validate for memberships (#24925) (#24926) 2021-03-17 19:51:59 +05:30