CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 423 Branches 1,723 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
e40d63dc13 fix(e-invoicing): totals validation of e-invoices (#28476) 2021-11-22 11:23:33 +05:30
Deepesh Garg
707c41af3b Merge pull request #28475 from frappe/mergify/bp/version-13-hotfix/pr-28471 
fix: bug with qrcode generation due to default print format name (backport #28471)
 2021-11-22 11:17:10 +05:30
Deepesh Garg
2a165d6250 Merge pull request #28474 from frappe/mergify/bp/version-13-pre-release/pr-28471 
fix: bug with qrcode generation due to default print format name (backport #28471)
 2021-11-22 11:16:53 +05:30
Saqib
5266b34010 fix(e-invoicing): totals validation of e-invoices (#28418) 2021-11-22 10:57:05 +05:30
Saqib Ansari
9d58613159 fix: bug with qrcode generation due to default print format name 
(cherry picked from commit ac27391a1f)
 2021-11-22 05:08:36 +00:00
Saqib Ansari
2c6d973dd6 fix: bug with qrcode generation due to default print format name 
(cherry picked from commit ac27391a1f)
 2021-11-22 05:08:15 +00:00
mergify[bot]
cca51f5a6e fix: coa balance rendering bug (#28472) 2021-11-20 15:47:02 +05:30
Deepesh Garg
007057e5f2 Merge pull request #28462 from frappe/mergify/bp/version-13-pre-release/pr-28459 
fix(India): GST category not getting auto updated (backport #28459)
 2021-11-19 13:06:29 +05:30
Deepesh Garg
08207242c1 fix: Add test for gst category check 
(cherry picked from commit cdbc991e3f)
 2021-11-19 06:52:22 +00:00
Deepesh Garg
24c113bf68 fix(India): GST category not getting auto updated 
(cherry picked from commit f8a26a9fac)
 2021-11-19 06:52:22 +00:00
Deepesh Garg
b4f20a43d8 Merge pull request #28459 from deepeshgarg007/gst_category_set_fix 
fix(India): GST category not getting auto updated
 2021-11-19 12:21:12 +05:30
Deepesh Garg
cdbc991e3f fix: Add test for gst category check 2021-11-19 11:58:44 +05:30
Deepesh Garg
f8a26a9fac fix(India): GST category not getting auto updated 2021-11-19 11:03:13 +05:30
Marica
4a4b327026 Merge pull request #28412 from frappe/mergify/bp/version-13-hotfix/pr-28269 
refactor:  (ux) Accepted/Rejected/Received Qty UX (backport #28269)
 2021-11-18 15:40:15 +05:30
marination
1d706fd0f7 fix: (server test) Missing variable declaration 2021-11-18 15:19:12 +05:30
Ankush Menat
5052989957 test: basic test for serialize reco cancel 
(cherry picked from commit ed99aca36f)
 2021-11-18 14:35:36 +05:30
Ankush Menat
098d6ccedf fix: can not cancel stock reconciliation with sr no 
(cherry picked from commit 8c85012a70)
 2021-11-18 14:35:36 +05:30
Ankush Menat
bceeb0f751 test: basic test for serialize reco cancel 
(cherry picked from commit ed99aca36f)
 2021-11-18 14:35:13 +05:30
Ankush Menat
cf9397eea0 fix: can not cancel stock reconciliation with sr no 
(cherry picked from commit 8c85012a70)
 2021-11-18 14:35:13 +05:30
mergify[bot]
6fdd5e990a chore: remove manual collapsing of section (#28435) (#28451) 
(cherry picked from commit 8102e4a210)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-18 14:14:44 +05:30
mergify[bot]
840256ee31 chore: remove manual collapsing of section (#28435) (#28450) 
(cherry picked from commit 8102e4a210)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-18 14:12:27 +05:30
mergify[bot]
a60c64857a fix: unchecking the "With Operations" in BOM clears operations table (backport #28446) (#28447) 
* fix: unchecking the "With Operations" in BOM clears operations table #28446

(cherry picked from commit 488d34af1f)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.js

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-18 14:11:45 +05:30
Anupam Kumar
9346398e19 Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-18 10:38:32 +05:30
Ankush Menat
38d956f9f9 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28269 2021-11-17 19:38:57 +05:30
mergify[bot]
3359c547d6 fix: (style) Warehouse Capacity Dashboard UI (#28438) 
- Made refresh button icon visible
- Edit Capacity button size and alignment
- Medium font on dashboard

(cherry picked from commit 23486a929d)

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2021-11-17 19:37:38 +05:30
mergify[bot]
b4db3362e0 fix: added job_card_item link in material request (#28222) (#28434) 
* fix: added job_card_item links in material request

* fix: add no copy to row references

(cherry picked from commit cb064b06ad)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-17 19:37:20 +05:30
mergify[bot]
b961ad6789 fix: added job_card_item link in material request (#28222) (#28433) 
* fix: added job_card_item links in material request

* fix: add no copy to row references

(cherry picked from commit cb064b06ad)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-17 19:37:08 +05:30
Anupam
8343a1d81e fix: linter issue 2021-11-17 18:27:58 +05:30
Anupam
b876d5b328 fix: linter issue 2021-11-17 18:24:32 +05:30
Anupam
dbda20a71f Merge branch 'crm-lead-validate-cleanup' of github.com:anupamvs/erpnext into crm-lead-validate-cleanup 2021-11-17 17:45:13 +05:30
Anupam
00b1d33ec6 fix: linter issue 2021-11-17 17:44:42 +05:30
Anupam Kumar
498d5403d5 Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-17 17:37:56 +05:30
Anupam
01c1f2529e fix: lead validate function cleanup 2021-11-17 17:33:48 +05:30
rohitwaghchaure
31be9aa8be Merge pull request #28429 from frappe/mergify/bp/version-13-hotfix/pr-28417 
fix: currency wise pricing rule not working (backport #28417)
 2021-11-17 14:39:08 +05:30
rohitwaghchaure
16b90688bb Merge pull request #28430 from frappe/mergify/bp/version-13-pre-release/pr-28417 
fix: currency wise pricing rule not working (backport #28417)
 2021-11-17 14:38:51 +05:30
Rohit Waghchaure
c118fa1ada fix: currency wise pricing rule not working 
(cherry picked from commit 43aeb541c2)
 2021-11-17 08:33:33 +00:00
Rohit Waghchaure
b3a86976a1 fix: currency wise pricing rule not working 
(cherry picked from commit 43aeb541c2)
 2021-11-17 08:33:08 +00:00
rohitwaghchaure
801e6df37a Merge pull request #28426 from frappe/mergify/bp/version-13-pre-release/pr-28425 
fix: performance issue while submitting the Journal Entry (backport #28425)
 2021-11-17 13:34:30 +05:30
rohitwaghchaure
c7cfce7628 Merge pull request #28427 from frappe/mergify/bp/version-13-hotfix/pr-28425 
fix: performance issue while submitting the Journal Entry (backport #28425)
 2021-11-17 13:33:48 +05:30
Rohit Waghchaure
7a76db4335 fix: performance to submit the JV 
(cherry picked from commit 7472760ea3)
 2021-11-17 07:26:52 +00:00
Rohit Waghchaure
70a130e78d fix: performance to submit the JV 
(cherry picked from commit 7472760ea3)
 2021-11-17 07:25:29 +00:00
rohitwaghchaure
af251e439a Merge pull request #28419 from rohitwaghchaure/merge-hotfix-to-pre-release-for-13-15 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-11-16 22:37:01 +05:30
Rohit Waghchaure
d556645455 Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-11-16 21:25:53 +05:30
Marica
e6451a3a85 Merge pull request #28414 from frappe/mergify/bp/version-13-hotfix/pr-28228 
fix: Pull only Items that are in Job Card in a Stock Entry against Job Card (backport #28228)
 2021-11-16 19:09:13 +05:30
marination
af430bb590 fix: Merge conflicts 2021-11-16 18:58:36 +05:30
marination
a34eae7bc7 fix: test_job_card_partial_material_transfer test 
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274d79)
 2021-11-16 13:08:31 +00:00
marination
d086039f1b fix: Server side test 
- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba7a8)
 2021-11-16 13:08:30 +00:00
marination
619c066f67 fix: (travis) Production Plan Summary Report breaks if no WO 
- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2b86)
 2021-11-16 13:08:29 +00:00
marination
0ee54b0779 fix: Partial Trabsfers against JC 
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25dff)
 2021-11-16 13:08:28 +00:00
marination
e3dcccdd18 test: Stock Entry from JC correctness (items mapping and qty) 
(cherry picked from commit 0aa237f38c)
 2021-11-16 13:08:26 +00:00