schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,485 Commits 322 Branches 1,581 Tags
db7fbfb5a77f7a052e8c3a8e488b9d92624deb18
Commit Graph

38485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
db7fbfb5a7 Merge branch 'version-13-pre-release' into version-13 v13.15.2 2021-11-29 19:18:12 +05:30
Rohit Waghchaure
f1fb0fc5cb bumped to version 13.15.2 2021-11-29 19:38:12 +05:50
Deepesh Garg
6feb0df8e8 Merge pull request #28621 from frappe/mergify/bp/version-13-pre-release/pr-28464 
fix:Change QR Code Triggerr event (backport #28464)
 2021-11-29 19:15:13 +05:30
Deepesh Garg
ca375b0e8d fix: Move trigger from on trash to on cancel 
(cherry picked from commit 4382040fb6)
 2021-11-29 13:18:15 +00:00
Mohammed Redah
26932885bb fix:Change QR Code Triggerr event 
This fixes the bug if the user changes the date after insertion it will show the wrong values

(cherry picked from commit 9d319c2205)
 2021-11-29 13:18:14 +00:00
Deepesh Garg
69c0e4dea1 Merge pull request #28612 from frappe/mergify/bp/version-13-pre-release/pr-28605 
refactor(KSA VAT): QR Code as per ZATKA specification (backport #28605)
 2021-11-29 17:38:26 +05:30
Deepesh Garg
9348fcf6c3 fix: KSA print format for invoices not having item codes 
(cherry picked from commit af6fc29770)
 2021-11-29 11:17:04 +00:00
Deepesh Garg
3289ba92fa fix: Translations 
(cherry picked from commit f3f7ed6f0d)
 2021-11-29 11:17:03 +00:00
Ahmad
f2f00ad402 fix: KSA VAT QR Code arabic conversion 
(cherry picked from commit 31b9b84fdf)
 2021-11-29 11:17:03 +00:00
Ahmad
641043e893 refactor: comments removed 
(cherry picked from commit de784d8bfe)
 2021-11-29 11:17:02 +00:00
Ahmad
fda69bc0cf refactor(KSA VAT): QR Code as per ZATKA specification 
(cherry picked from commit d1746caa02)
 2021-11-29 11:17:01 +00:00
Rohit Waghchaure
a0579ece92 Merge branch 'version-13-pre-release' into version-13 v13.15.1 2021-11-26 12:38:51 +05:30
Rohit Waghchaure
652b7393dc bumped to version 13.15.1 2021-11-26 12:58:50 +05:50
mergify[bot]
46df181d00 fix: do not get password if client_secret is not set (#28554) 2021-11-25 13:45:44 +05:30
Rohit Waghchaure
c92dfa988e Merge branch 'version-13-pre-release' into version-13 v13.15.0 2021-11-22 22:50:39 +05:30
Rohit Waghchaure
d03bc7d8dc bumped to version 13.15.0 2021-11-22 23:10:38 +05:50
rohitwaghchaure
742249b6c9 Merge pull request #28508 from rohitwaghchaure/change-log-for-v13-15 
chore: change log for v13.15.0
 2021-11-22 22:48:43 +05:30
Rohit Waghchaure
24c21c7f49 chore: change log for v13.15.0 2021-11-22 22:45:58 +05:30
rohitwaghchaure
c48f60e6e2 Merge pull request #28506 from frappe/revert-28499-mergify/bp/version-13-pre-release/pr-28491 
revert: "feat: Accounts, Selling & Assets Onboarding cleanup #28499"
 2021-11-22 22:31:54 +05:30
Saqib
8824712feb Revert "feat: Accounts, Selling & Assets Onboarding cleanup (#28499)" 
This reverts commit 145bcbaa6d.
 2021-11-22 20:26:44 +05:30
Deepesh Garg
3b2b9ce70c Merge pull request #28503 from frappe/mergify/bp/version-13-pre-release/pr-28469 
fix: FY query returning None for new company (backport #28469)
 2021-11-22 20:20:17 +05:30
Subin Tom
953f46e289 fix: FY query returning None for new company 
(cherry picked from commit 350ed1a6c2)
 2021-11-22 13:54:11 +00:00
mergify[bot]
761bd8c97b fix: KSA Invoice print format for multicurrency invoices (#28495) 2021-11-22 18:25:37 +05:30
mergify[bot]
145bcbaa6d feat: Accounts, Selling & Assets Onboarding cleanup (#28499) 2021-11-22 18:24:51 +05:30
mergify[bot]
1b4659f028 fix: Closed status error in Work Order Summary (backport #28460) 
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* 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-22 13:23:22 +05:30
mergify[bot]
e40d63dc13 fix(e-invoicing): totals validation of e-invoices (#28476) 2021-11-22 11:23:33 +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 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
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
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]
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
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
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
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
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
marination
f3c562bd5b fix: Pull Items that are in JC in Stock Entry against JC 
- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da03028f3)
 2021-11-16 13:08:24 +00:00
mergify[bot]
0c65206d69 fix: POS idx issue in taxes table while merging (#28411) 2021-11-16 18:19:57 +05:30
mergify[bot]
09251b3ddf refactor: fix help section background in dark mode (#28406) (#28408) 
(cherry picked from commit 952fc87c99)

Co-authored-by: Ahmed Shareef <46922290+penieldev@users.noreply.github.com>
 2021-11-16 14:32:23 +05:30