Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
379 commits
Select commit Hold shift + click to select a range
952c60b
Merge branch 'version-13-hotfix' into 'version-13-pre-release'
rohitwaghchaure Oct 14, 2021
1b7d94d
Merge pull request #27961 from rohitwaghchaure/merge-13-hotfix-to-pre…
rohitwaghchaure Oct 14, 2021
02ddd5f
fix: remove bad description (#27963) (#27964)
mergify[bot] Oct 14, 2021
2e9d08f
fix: Retain space inside Serial no string while cleaning serial nos
marination Oct 14, 2021
db9f56b
fix: Use strip instead of lstrip and rstrip
marination Oct 14, 2021
0d1b043
test: Include serial no with spaces in it in sanitation test
marination Oct 14, 2021
7b4a5e7
Merge pull request #27965 from frappe/mergify/bp/version-13-hotfix/pr…
marination Oct 14, 2021
268893d
fix: POS Profile payment methods table (#27956) (#27966)
mergify[bot] Oct 15, 2021
2896507
fix: Interstate internal transfer invoices not visible in GSTR-1
deepeshgarg007 Oct 16, 2021
4415bf9
fix: Interstate internal transfer invoices not visible in GSTR-1
deepeshgarg007 Oct 16, 2021
50e718f
fix: TDS round off not working from second transaction
deepeshgarg007 Oct 13, 2021
9b71e02
fix: TDS round off not working from second transaction
deepeshgarg007 Oct 16, 2021
64b58b1
fix: TDS round off not working from second transaction
deepeshgarg007 Oct 13, 2021
1796f09
fix: TDS round off not working from second transaction
deepeshgarg007 Oct 16, 2021
f2340b3
fix: Account number and name incorrectly import using COA importer
deepeshgarg007 Oct 15, 2021
0012f0b
fix: Account number and name incorrectly import using COA importer
deepeshgarg007 Oct 15, 2021
acc5cff
fix: exclude inactive employees from auto attendance
pateljannat Oct 7, 2021
b648d77
fix: exclude inactive employees from auto attendance
pateljannat Oct 7, 2021
44ab131
fix: Retain space inside Serial no string while cleaning serial nos
marination Oct 14, 2021
0fcb3cd
fix: Use strip instead of lstrip and rstrip
marination Oct 14, 2021
e69bd39
test: Include serial no with spaces in it in sanitation test
marination Oct 14, 2021
4620902
Merge pull request #27985 from frappe/mergify/bp/version-13-pre-relea…
pateljannat Oct 18, 2021
f038328
Merge pull request #27986 from frappe/mergify/bp/version-13-pre-relea…
ankush Oct 18, 2021
07a9f16
Merge pull request #27984 from frappe/mergify/bp/version-13-hotfix/pr…
pateljannat Oct 18, 2021
a883f16
Merge pull request #27978 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 18, 2021
41a0e12
Merge pull request #27979 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Oct 18, 2021
c99fe8b
Merge pull request #27980 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 18, 2021
eecfb25
Merge pull request #27981 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Oct 18, 2021
9f71863
Merge pull request #27982 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 18, 2021
f8348ab
Merge pull request #27983 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Oct 18, 2021
f328b22
fix: flaky Org Chart Test (#27971) (#27988)
mergify[bot] Oct 18, 2021
fdd9cc7
fix: flaky Org Chart Test (#27971) (#27989)
mergify[bot] Oct 18, 2021
3708839
feat: add enabled field in UOM (#27993) (#27996)
mergify[bot] Oct 19, 2021
efc292a
YTD and MTD Messed up in Salary Slip
govindsmenokee Oct 19, 2021
9431bb9
fix: changes in schedules gets overwritten on save
noahjacob Oct 18, 2021
3af060c
fix: TaxJar update - added nexus list, making api call only for nexus…
mergify[bot] Oct 19, 2021
b6609d1
Merge pull request #27998 from frappe/mergify/bp/version-13-pre-relea…
noahjacob Oct 19, 2021
3544888
Merge pull request #27999 from frappe/mergify/bp/version-13-hotfix/pr…
mergify[bot] Oct 19, 2021
ebe68c1
fix: Totals row incorrect value in GL Entry (#27867)
deepeshgarg007 Oct 19, 2021
5a06ee9
fix: Totals row incorrect value in GL Entry (#27867)
deepeshgarg007 Oct 19, 2021
0a4abff
Merge branch 'version-13-hotfix' into patch-7
pateljannat Oct 19, 2021
94177c0
fix: Fetch thumbnail from Item master instead of regenerating
marination Oct 19, 2021
7895d2a
Merge pull request #28004 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Oct 19, 2021
11c498d
fix: re-run patch
marination Oct 19, 2021
46a5a83
fix: Get db values as dict when checking for thumbnail in existing we…
marination Oct 19, 2021
ac8014e
fix: Check if thumbnail column exists in case of table trimming
marination Oct 19, 2021
2fff5e5
fix: map missing fields in opportunity (#27904)
pateljannat Oct 20, 2021
9166d58
fix: map missing fields in opportunity (#27904)
pateljannat Oct 20, 2021
ae948e3
fix: linters
pateljannat Oct 20, 2021
873d166
fix: conflicts
pateljannat Oct 20, 2021
698214b
fix: removed unused lines
pateljannat Oct 20, 2021
8e2a84e
Merge pull request #27997 from govindsmenokee/patch-7
pateljannat Oct 20, 2021
f12deae
fix: Error in TDS computation summary
deepeshgarg007 Oct 20, 2021
8c57394
fix: conflicts
pateljannat Oct 20, 2021
b7befe4
fix: Check for other properties
deepeshgarg007 Oct 20, 2021
944e3d4
fix: Check for supplier name
deepeshgarg007 Oct 20, 2021
6e63dc1
Merge pull request #28013 from frappe/mergify/bp/version-13-pre-relea…
pateljannat Oct 20, 2021
50af32f
Update employee_leave_balance.py
gohyc Oct 1, 2021
867cfa0
Update employee_leave_balance.py
gohyc Oct 1, 2021
8e9db11
Merge pull request #28012 from frappe/mergify/bp/version-13-hotfix/pr…
pateljannat Oct 20, 2021
3cf5861
Merge pull request #28015 from frappe/mergify/bp/version-13-hotfix/pr…
pateljannat Oct 20, 2021
348a961
fix: Move thumbnail updation to different patch
marination Oct 20, 2021
077026a
Merge pull request #28005 from marination/patch-thumbnail-perf
marination Oct 20, 2021
a022e01
fix: Fetch thumbnail from Item master instead of regenerating
marination Oct 19, 2021
a915b9c
fix: re-run patch
marination Oct 19, 2021
d7afb9e
fix: Get db values as dict when checking for thumbnail in existing we…
marination Oct 19, 2021
c98421c
fix: Check if thumbnail column exists in case of table trimming
marination Oct 19, 2021
b906cc2
fix: Move thumbnail updation to different patch
marination Oct 20, 2021
e0decb0
Merge pull request #28021 from frappe/mergify/bp/version-13-pre-relea…
marination Oct 20, 2021
676c528
Merge pull request #28016 from frappe/mergify/bp/version-13-pre-relea…
pateljannat Oct 20, 2021
a739bf9
feat: Tax for recurring additional salary (backport #27459) (#28024)
mergify[bot] Oct 20, 2021
9ce7ea6
fix: avoid resetting employee on amending timesheets (#28025) (#28026)
mergify[bot] Oct 20, 2021
47befa6
fix: incorrect status being set in Invoices (backport #28019) (#28030)
mergify[bot] Oct 20, 2021
ffadd67
fix: add mistakenly removed patches
sagarvora Oct 20, 2021
34e92ab
fix: incorrect status being set in Invoices (backport #28019) (#28031)
mergify[bot] Oct 20, 2021
8fffd15
fix: dont recompute item wise taxes from front end
ankush Oct 19, 2021
1fae8f1
Merge pull request #28038 from frappe/mergify/bp/version-13-hotfix/pr…
mergify[bot] Oct 20, 2021
e357541
fix: remove employee_name from job card summary
ankush Oct 20, 2021
408c4a6
fix: remove debug from query
ankush Oct 20, 2021
5ba315e
test: execute manufacturing reports
ankush Oct 20, 2021
4f5d678
fix: consolidated report issue #28035 (#28039)
mergify[bot] Oct 20, 2021
7c9018f
chore: change log for v13.13.0
rohitwaghchaure Oct 20, 2021
200f6da
Merge pull request #28040 from rohitwaghchaure/change-log-for-v13-13
rohitwaghchaure Oct 20, 2021
a3b7682
bumped to version 13.13.0
rohitwaghchaure Oct 20, 2021
b8d75ff
Merge branch 'version-13-pre-release' into version-13
rohitwaghchaure Oct 20, 2021
e0f2130
feat: employee initial work history updated when transfer is performe…
mergify[bot] Oct 21, 2021
71e517f
test: fix get_attribute_filter test
ankush Oct 21, 2021
152f9b0
fix: useless validation message (#28029)
dj12djdjs Oct 21, 2021
5ed32b5
fix: unused imports
ankush Oct 21, 2021
46567f0
refactor: move process loss report to manufacturing (#28043) (#28047)
mergify[bot] Oct 21, 2021
624005e
Merge remote-tracking branch 'upstream/version-13' into parsimony-pro…
Oct 21, 2021
d7e5538
fix: SO Portal fixes
marination Oct 21, 2021
60620fe
fix: don't reset rates in Timesheet Detail when Activity Type is clea…
mergify[bot] Oct 22, 2021
a082d70
ci: move semgrep rules out of repo (backport #28067)
mergify[bot] Oct 22, 2021
7a08f8a
chore: change semgrep rules repo name
ankush Oct 22, 2021
943def5
Merge pull request #28014 from deepeshgarg007/tds_computation_summary…
deepeshgarg007 Oct 23, 2021
a23ef95
refactor: shows opening balance from filtered from_date (#26877) (#28…
mergify[bot] Oct 25, 2021
f81c5cd
fix: POS Closing Entry without linked invoices (#28077)
mergify[bot] Oct 26, 2021
f63a71e
fix(minor): Add mandatory depends on condition for reference no and d…
deepeshgarg007 Oct 21, 2021
dd2dba6
style: Fixed indentation for visible heirarchy
marination Oct 27, 2021
8cad23b
fix: add filter to query to avoid send reminder for zero years (#28092)
gsi-maruiz Oct 27, 2021
019c5a3
fix(ux): overbiling message in SO->SI, PO->PI (bp #28088)
mergify[bot] Oct 27, 2021
a30cfbc
fix: change modified timestamp to apply changes on migrate #28095 (#2…
mergify[bot] Oct 27, 2021
93a0ea7
feat(pick list): group items based on item code and warehouse before …
DeeMysterio Oct 5, 2021
28026f7
refactor: use defaultdict and enumeration
ankush Oct 27, 2021
a046da1
test: picklist item grouping
ankush Oct 27, 2021
cb97e95
feat(e-invoicing): dispatch address (#28084)
nextchamp-saqib Oct 27, 2021
de38c70
perf: skip get_pricing_rules if no pricing rule exists
nextchamp-saqib Oct 12, 2021
cb0168a
perf: fetch mode of payments data in single query
nextchamp-saqib Oct 12, 2021
97fc449
perf: get total company stock only for purchase order
nextchamp-saqib Oct 12, 2021
b1efb7f
perf: skip insertion of stock ledger entry
nextchamp-saqib Oct 12, 2021
a2a462f
fix: undo changes to allow negative stock flag
ankush Oct 12, 2021
5d4d6bb
fix: sider
nextchamp-saqib Oct 18, 2021
6acab32
Merge pull request #28085 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 27, 2021
accb98c
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr…
AfshanKhan Oct 27, 2021
d4b4bd9
fix: update production plan status (backport #27567)
mergify[bot] Oct 27, 2021
fb74247
fix: Payment Terms validation precision (#28104)
mergify[bot] Oct 27, 2021
f1b7bb8
fix: Update receivable/payable account on company change (backport #2…
mergify[bot] Oct 27, 2021
67e5e95
Merge pull request #27931 from marination/optimize-get-attribute-filt…
marination Oct 27, 2021
e8b46bf
fix(ux): add naming series to ERPNext setting workspace (backport #2…
mergify[bot] Oct 27, 2021
db55932
Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr…
AfshanKhan Oct 27, 2021
2a60a65
Merge pull request #28102 from frappe/mergify/bp/version-13-hotfix/pr…
nextchamp-saqib Oct 27, 2021
e757970
fix(general_ledger): Order by in case Group by Account (#28093) (#28106)
mergify[bot] Oct 27, 2021
5867d97
fix(ux): misleading label for image fields (#28107) (#28109)
mergify[bot] Oct 27, 2021
48acb56
fix: Remove pointless buttons from Payment Order (#28108)
mergify[bot] Oct 27, 2021
99a1eea
fix: remove bad hardcoded max value
ankush Oct 27, 2021
4bfacab
fix(ux): alternative item two way validation
ankush Oct 27, 2021
aa210ba
fix: don't show blocked supplier in autocomplete
ankush Oct 27, 2021
56c98aa
fix(ux): make qty 1 by default in WO
ankush Oct 27, 2021
b34e737
fix: Autoemail report not showing dynamic report filters
deepeshgarg007 Oct 27, 2021
5388ecf
Merge pull request #27926 from frappe/mergify/bp/version-13-hotfix/pr…
marination Oct 27, 2021
a19f0f4
Merge pull request #28098 from marination/so-quote-portal
marination Oct 27, 2021
9c7cdc1
fix: opportunity link is missign from customer (#28110) (#28121)
mergify[bot] Oct 28, 2021
d116aa6
Merge pull request #28116 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 28, 2021
e03965a
feat(Regional): KSA VAT Report
ahmadpak Aug 26, 2021
60fd960
feat(regional): QR Code generation for Saudi Arabia Sales Invoices
ahmadpak Sep 6, 2021
a8ba52e
Update erpnext/regional/report/ksa_vat/ksa_vat.py
ahmadpak Sep 14, 2021
220ab16
Refactor erpnext/regional/__init__.py
ahmadpak Sep 14, 2021
3fca08e
Update erpnext/regional/saudi_arabia/setup.py
ahmadpak Sep 14, 2021
873ed1a
refactor(regional): moved methos to region specific utils for KSA
ahmadpak Sep 14, 2021
5f7c5bc
fix: indentations
ahmadpak Sep 16, 2021
f9770b6
Update erpnext/regional/saudi_arabia/utils.py
ahmadpak Sep 16, 2021
0313b44
Update erpnext/regional/saudi_arabia/utils.py
ahmadpak Sep 16, 2021
30f3b48
refactor (regional): KSA utils
ahmadpak Sep 16, 2021
301b94e
fix: pre-commit hooks
ahmadpak Sep 16, 2021
b693811
fix: pre-commit hooks
ahmadpak Sep 16, 2021
6d39b90
refactor: make strings translate
ahmadpak Oct 10, 2021
e9c3d3f
fix: Get LTDS based on tax withholding category
deepeshgarg007 Oct 23, 2021
1ba0111
fix: Replace section code with tax withholding category in LDC
deepeshgarg007 Oct 23, 2021
7a25d5f
fix: Rewrite patch using query builder
deepeshgarg007 Oct 28, 2021
4019148
fix: Resolve conflicts
deepeshgarg007 Oct 28, 2021
6260f0c
Merge pull request #28128 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 29, 2021
c822f28
Merge pull request #28125 from deepeshgarg007/ksa-vat-v13
deepeshgarg007 Oct 29, 2021
2fb18af
fix: Unlink PO on cancelling SO
GangaManoj Sep 20, 2021
7c42b8b
fix: Unlink PO on cancelling SO
GangaManoj Sep 20, 2021
d47007a
fix: Remove print statements
GangaManoj Oct 28, 2021
305b950
fix: Remove debugger
GangaManoj Oct 28, 2021
ed58f20
fix: Remove unused imports
GangaManoj Oct 28, 2021
a60ecb9
fix: Ignore PO on So cancel
deepeshgarg007 Oct 29, 2021
3fc2442
fix: Consolidated Financial Report throws error for empty equity data…
nemesis189 Oct 28, 2021
1c0ae92
Merge pull request #28133 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 29, 2021
ee6da35
Merge pull request #28134 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 29, 2021
a33ebbd
test: remove unnecessary creation of new company (#28137) (#28140)
mergify[bot] Oct 29, 2021
1454f8b
fix: Skip empty rows while updating unsaved BOM cost (#28136) (#28142)
mergify[bot] Oct 29, 2021
7cbf577
fix: Accounting Dimension filters not honouring user permissions
deepeshgarg007 Oct 29, 2021
ff7423f
fix: incorrect VAT Amount in UAT VAT 201 report
rtdany10 Oct 18, 2021
43ca66f
fix: wrong vat amount
rtdany10 Oct 19, 2021
4f7046e
Merge pull request #28143 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 29, 2021
0664e64
fix: COA importer importing all accounts as group
deepeshgarg007 Oct 29, 2021
f7cf3fe
Merge pull request #28144 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 29, 2021
835d96c
fix: incorrect amount of serial_nos fetched
noahjacob Oct 20, 2021
7931cfd
refactor: replaced db.sql with qb
noahjacob Oct 21, 2021
42686f9
fix: fetch serial nos from ledger unconditionally
ankush Oct 29, 2021
264ffe0
refactor: simplify sr no fetching
ankush Oct 29, 2021
9e9f730
fix: sort by creation to break tie
ankush Oct 29, 2021
fe59c31
Merge pull request #28148 from frappe/mergify/bp/version-13-hotfix/pr…
deepeshgarg007 Oct 29, 2021
f16e0e1
fix: POS consolidated invoice rounded total issue (#28146)
mergify[bot] Oct 29, 2021
9abb467
fix: Make status filter optional (#28151)
mergify[bot] Oct 29, 2021
8581b5c
chore: merge branch 'version-13-hotfix' into 'version-13-pre-release'
rohitwaghchaure Oct 30, 2021
aa464cc
fix: Error for missing PAN no field
deepeshgarg007 Oct 30, 2021
88bf748
Merge pull request #28159 from rohitwaghchaure/merge-hotfix-to-pre-re…
rohitwaghchaure Oct 30, 2021
0601276
fix: patch update_category_in_ltds_certificate
rohitwaghchaure Oct 31, 2021
feaae33
Merge pull request #28170 from frappe/mergify/bp/version-13-pre-relea…
rohitwaghchaure Oct 31, 2021
978d1cd
Merge pull request #28165 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Oct 31, 2021
18dddfd
fix: remove duplicate field from selling_settings (#28174)
mergify[bot] Nov 1, 2021
e9d1cbb
fix: COGS account in purchase receipt
rohitwaghchaure Jul 30, 2021
271dad9
fix: pass company while fetching valuation rate
ankush Nov 1, 2021
c6557a1
fix: use warehouse to find company
ankush Nov 1, 2021
bb7d661
fix: Resolve conflicts
deepeshgarg007 Nov 1, 2021
982960f
Merge pull request #28177 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Nov 1, 2021
1736029
chore: migrate docker to github actions
revant Nov 2, 2021
6880915
fix: Remove warehouse filter on Batch field for Material Receipt
marination Nov 2, 2021
b81dfdc
chore: Add comment above fix for future reference
marination Nov 2, 2021
0731454
Merge pull request #28196 from frappe/mergify/bp/version-13-pre-relea…
marination Nov 2, 2021
50fbc16
fix(Payment Reconciliation): clear child tables on company/party chan…
mergify[bot] Nov 2, 2021
093d9f4
fix: Serial Nos not set in the row after scanning in popup
marination Nov 2, 2021
e358d34
fix: Error on LDC creation
deepeshgarg007 Nov 2, 2021
885f1e0
Merge pull request #28207 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Nov 2, 2021
fa5cee4
Merge pull request #28204 from frappe/mergify/bp/version-13-pre-relea…
marination Nov 2, 2021
94905df
fix: ignore unsupported methods while resyncing (#28210) (#28214)
mergify[bot] Nov 3, 2021
afb236a
ci: change GITHUB_PAT to CI_PAT
revant Nov 3, 2021
2c92668
fix(Payment Entry): splitting outstanding rows as per payment terms (…
Anuja-pawar Nov 2, 2021
9a3c669
Merge pull request #28221 from frappe/mergify/bp/version-13-pre-relea…
nextchamp-saqib Nov 3, 2021
b3dc199
Merge pull request #28191 from frappe/build-on-release
surajshetty3416 Nov 3, 2021
79be341
feat: replace newline in remarks (DATEV report) (#28152) (#28248)
mergify[bot] Nov 5, 2021
9f6b0db
new (Print Format): KSA VAT Invoice
ahmadpak Oct 30, 2021
0ba5904
update(Print Format): Sales Invoice
ahmadpak Nov 8, 2021
35bd31e
Merge pull request #28270 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Nov 8, 2021
aa6caa0
fix: KSA VAT setup issues
deepeshgarg007 Nov 8, 2021
f5251b5
fix: Add patch to make custom fields
deepeshgarg007 Nov 8, 2021
2dc1250
fix: Resolve conflicts
deepeshgarg007 Nov 8, 2021
3d1b833
fix: Fixed customer address variable, sales invoice item field curren…
nemesis189 Nov 8, 2021
abe6ef4
fix: Added company field, filtered account heads
nemesis189 Nov 8, 2021
1dc7cb8
fix: fixed company field, updated patch
nemesis189 Nov 8, 2021
a403200
fix: company condition fix, added company field
nemesis189 Nov 8, 2021
2654098
Merge pull request #28274 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Nov 8, 2021
5d46f76
Merge pull request #28276 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Nov 8, 2021
40b5bb1
fix: do not generate multiple invoices (#28216)
mergify[bot] Nov 8, 2021
eacf26d
fix: show full item name in search widget (#28283) (#28285)
mergify[bot] Nov 9, 2021
e8ef54f
feat: provision to close the Work Order
anupamvs Oct 29, 2021
d43aecb
feat: added confirm dialog on closing of workorder
anupamvs Oct 31, 2021
44c53de
fix: sider issue
anupamvs Oct 31, 2021
47f8f3d
fix: sider issue
anupamvs Oct 31, 2021
8ddeb83
fix: sider issue
anupamvs Oct 31, 2021
f3da88e
fix: added testcase
anupamvs Nov 2, 2021
7c7493c
fix: linter issues
anupamvs Nov 2, 2021
cb209d9
fix: linter issues
anupamvs Nov 2, 2021
dce943b
fix: test cases
anupamvs Nov 2, 2021
116210d
fix: validate job card
anupamvs Nov 3, 2021
8851b7a
fix: sider isuue
anupamvs Nov 3, 2021
029e667
fix: linter isuue
anupamvs Nov 3, 2021
365572f
fix: testcases:
anupamvs Nov 3, 2021
dac0d87
fix: test cases
anupamvs Nov 9, 2021
515b8dd
fix: get_planned_qty chnages
anupamvs Nov 9, 2021
3c78ac2
feat(manufacturing): add link field for quality inspection template …
DeeMysterio Nov 1, 2021
ac54e80
feat: provision to have limited parameters for in-process quality ins…
DeeMysterio Nov 3, 2021
bb9713a
refactor: use fetch from property for qi template on job card
DeeMysterio Nov 9, 2021
81e7ebc
Merge pull request #28293 from frappe/mergify/bp/version-13-pre-relea…
rohitwaghchaure Nov 9, 2021
346c76c
Merge pull request #28290 from frappe/mergify/bp/version-13-pre-relea…
rohitwaghchaure Nov 9, 2021
fa2f134
fix(India setup): setup company independent fixtures for patch (#28304)
mergify[bot] Nov 9, 2021
f3cfb93
chore: Added change log for version 13.14.0
rohitwaghchaure Nov 9, 2021
b9da89a
Merge pull request #28305 from rohitwaghchaure/change-log-for-v13-14-0
rohitwaghchaure Nov 9, 2021
6b77bac
bumped to version 13.14.0
rohitwaghchaure Nov 9, 2021
ab904c2
Merge branch 'version-13-pre-release' into version-13
rohitwaghchaure Nov 9, 2021
6661cc7
fix(pos): get mode of payments query (#28323)
nextchamp-saqib Nov 10, 2021
b0a58f4
fix: Default party account getting overriden in invoices
deepeshgarg007 Nov 12, 2021
2747f26
Merge pull request #28366 from frappe/mergify/bp/version-13-pre-relea…
deepeshgarg007 Nov 12, 2021
7fc2f24
bumped to version 13.14.1
rohitwaghchaure Nov 12, 2021
575d41c
Merge branch 'version-13-pre-release' into version-13
rohitwaghchaure Nov 12, 2021
ec8ca8b
Merge remote-tracking branch 'upstream/version-13' into parsimony-pro…
Nov 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/helper/.flake8_strict
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[flake8]
ignore =
B007,
B009,
B010,
B950,
E101,
E111,
Expand Down
38 changes: 0 additions & 38 deletions .github/helper/semgrep_rules/README.md

This file was deleted.

18 changes: 18 additions & 0 deletions .github/helper/semgrep_rules/frappe_correctness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,21 @@ rules:
key `$X` is uselessly assigned twice. This could be a potential bug.
languages: [python]
severity: ERROR


- id: frappe-manual-commit
patterns:
- pattern: frappe.db.commit()
- pattern-not-inside: |
try:
...
except ...:
...
message: |
Manually commiting a transaction is highly discouraged. Read about the transaction model implemented by Frappe Framework before adding manual commits: https://frappeframework.com/docs/user/en/api/database#database-transaction-model If you think manual commit is required then add a comment explaining why and `// nosemgrep` on the same line.
paths:
exclude:
- "**/patches/**"
- "**/demo/**"
languages: [python]
severity: ERROR
34 changes: 0 additions & 34 deletions .github/helper/semgrep_rules/report.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/helper/semgrep_rules/security.py

This file was deleted.

10 changes: 0 additions & 10 deletions .github/helper/semgrep_rules/security.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/helper/semgrep_rules/translate.js

This file was deleted.

61 changes: 0 additions & 61 deletions .github/helper/semgrep_rules/translate.py

This file was deleted.

64 changes: 0 additions & 64 deletions .github/helper/semgrep_rules/translate.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .github/helper/semgrep_rules/ux.js

This file was deleted.

30 changes: 0 additions & 30 deletions .github/helper/semgrep_rules/ux.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:
- name: curl
run: |
apk add curl bash
curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token ${{ secrets.TRAVIS_CI_TOKEN }}" -d '{"request":{"branch":"master"}}' https://api.travis-ci.com/repo/frappe%2Ffrappe_docker/requests
curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/frappe/frappe_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}'
20 changes: 12 additions & 8 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: returntocorp/semgrep-action@v1
env:
SEMGREP_TIMEOUT: 120
with:
config: >-
r/python.lang.correctness
.github/helper/semgrep_rules

- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install and Run Pre-commit
uses: pre-commit/action@v2.0.0
uses: pre-commit/action@v2.0.3

- name: Download Semgrep rules
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules

- uses: returntocorp/semgrep-action@v1
env:
SEMGREP_TIMEOUT: 120
with:
config: >-
r/python.lang.correctness
./frappe-semgrep-rules/rules
2 changes: 2 additions & 0 deletions .github/workflows/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ jobs:

- name: Build Assets
run: cd ~/frappe-bench/ && bench build
env:
CI: Yes

- name: UI Tests
run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests erpnext --headless
Expand Down
Loading