Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump ini from 1.3.5 to 1.3.8 #1

Open
wants to merge 7,299 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7299 commits
Select commit Hold shift + click to select a range
be3b8a1
Merge branch 'develop' of https://github.com/frappe/erpnext into uom_…
Semiranis Sep 2, 2020
f28bef8
feat: Checkbox for activation of printing UOM after quantity
Semiranis Sep 2, 2020
0857e6d
fix: Add "Bank Clearance" and "Bank Reconciliation" in desk
michellealva Sep 3, 2020
5952efd
Merge pull request #23239 from michellealva/bank-reco-fix1
rohitwaghchaure Sep 3, 2020
979ad18
fix: update rfq item in postprocess
ruchamahabal Sep 3, 2020
54cd194
feat: removed roles for some reginal report and added via setup
Anurag810 Sep 3, 2020
6ffe809
Merge pull request #23233 from ruchamahabal/fix-rfq-conv-factor
rohitwaghchaure Sep 3, 2020
4b59043
Merge pull request #23241 from Anurag810/hiding_regional_reports
rohitwaghchaure Sep 3, 2020
d00bc3f
Merge branch 'develop' into item-group-filter-portal
rohitwaghchaure Sep 3, 2020
68b0108
fix: incorrect qty after transaction in stock ledger entry
rohitwaghchaure Jul 10, 2020
7952f89
feat: Overlap validation additional salary
Anurag810 Sep 3, 2020
f20b636
Merge branch 'develop' into overlap_for_additional_salary
gavindsouza Sep 3, 2020
21985d4
Merge branch 'develop' into dependabot/npm_and_yarn/bl-3.0.1
gavindsouza Sep 3, 2020
72e5384
Merge pull request #23237 from frappe/dependabot/npm_and_yarn/bl-3.0.1
gavindsouza Sep 3, 2020
e5b7cb0
fix: data was not properly maped
Anurag810 Sep 3, 2020
9b68177
fix: Account filter in Process Deferred Accounting doctype
deepeshgarg007 Sep 3, 2020
e399a8e
Merge pull request #23242 from rohitwaghchaure/incorrect-qty-after-tr…
rohitwaghchaure Sep 3, 2020
b306fa3
Merge pull request #23248 from deepeshgarg007/pda_account_filter
deepeshgarg007 Sep 3, 2020
2a56000
fix: Supplier Leaderboard fix
marination Sep 3, 2020
8d6b2d0
Merge branch 'develop' into leaderboard-supplier
marination Sep 3, 2020
a5d5e70
Revert "feat: Option to print UOM after quantity"
Semiranis Sep 3, 2020
9355641
refactor: logic moved to standard template
Semiranis Sep 3, 2020
2e8e06c
Merge branch 'develop' of https://github.com/frappe/erpnext into uom_…
Semiranis Sep 3, 2020
059ade8
Merge pull request #23249 from marination/leaderboard-supplier
marination Sep 4, 2020
8d8af94
fix: capture advance payments in payment order
Mangesh-Khairnar Sep 4, 2020
e1889d0
fix(payment entry): update payment order status
Mangesh-Khairnar Sep 4, 2020
faebef2
fix: SE quantity data type issue
anupamvs Sep 4, 2020
4a238a2
feat: don't allow guests
scmmishra Sep 4, 2020
a2655fd
Merge pull request #23261 from scmmishra/rzp-api
scmmishra Sep 4, 2020
c9a5afa
Merge pull request #23263 from Semiranis/uom_after_qty
rohitwaghchaure Sep 4, 2020
515d8b9
Merge pull request #23259 from anupamvs/se-quntity
rohitwaghchaure Sep 4, 2020
d9e4883
test: check payment order creation against payment entry
Mangesh-Khairnar Sep 4, 2020
a76bf4d
fix: remove unused imports
Mangesh-Khairnar Sep 4, 2020
7456ffc
fix: teardown created payment order
Mangesh-Khairnar Sep 4, 2020
4d636fd
fix: API changes in loan security unpledge utility
deepeshgarg007 Sep 4, 2020
e4c38e5
fix: Remove print statement
deepeshgarg007 Sep 4, 2020
1b4ed45
fix: Add reference no and descripiton field in Loan Security Pledge a…
deepeshgarg007 Sep 4, 2020
8e4ae0a
Merge pull request #23269 from deepeshgarg007/loan_security_unpledge_…
deepeshgarg007 Sep 4, 2020
a59f864
fix: pass stock_qty to get_pricing_rule_for_item
kasgel Sep 5, 2020
5158d0f
fix: Repayment Method not visible correctly
deepeshgarg007 Sep 5, 2020
c0fb7cb
Merge pull request #23272 from deepeshgarg007/loan_repayment_method
deepeshgarg007 Sep 5, 2020
937b634
Merge pull request #23270 from kasgel/patch-1
rohitwaghchaure Sep 6, 2020
ffd30be
Merge branch 'develop' into item-group-filter-portal
anupamvs Sep 6, 2020
fa98e81
fix: sql error on saving sales invoice without a sales order
barry86m Sep 7, 2020
209f7c7
feat: added transaction_type in leave ledger enter (#23258)
anupamvs Sep 7, 2020
06130ee
fix: leave ledger patch (#23182)
Mangesh-Khairnar Sep 7, 2020
9ce38de
chore: Key Validation and restructure
marination Sep 7, 2020
da6074a
fix: Pending loan interest accrual on loan closure
deepeshgarg007 Sep 7, 2020
afefa87
fix: Pending loan interest accrual on loan closure
deepeshgarg007 Sep 7, 2020
af1c4ba
Merge pull request #23279 from deepeshgarg007/loan_closure_interest
deepeshgarg007 Sep 7, 2020
74ab108
fix: Apply TDS on Purchase Invoice creation from Purchase Order and P…
deepeshgarg007 Sep 7, 2020
06ee0ea
feat: Added Scheduler Job to auto update statistics
marination Sep 7, 2020
54ab426
Merge branch 'develop' into youtube-analytics
marination Sep 7, 2020
f18dd05
fix: Missing import and typo
marination Sep 7, 2020
06f89a1
fix: Set student email id mandatory only if skip user creation is dis…
ruchamahabal Sep 7, 2020
4673bed
fix: codacy issues
ruchamahabal Sep 7, 2020
22bd03e
Merge branch 'develop' into item-group-filter-portal
anupamvs Sep 7, 2020
03b0ad4
fix: Only submitted Loan security pledges should be approved
deepeshgarg007 Sep 7, 2020
b828e2f
Merge pull request #23287 from deepeshgarg007/lsu_api_fix
deepeshgarg007 Sep 7, 2020
5b381ac
fix: consolidated financial statement sums values into wrong parent
barry86m Sep 7, 2020
7296a75
Merge pull request #23288 from barry86m/patch-4
rohitwaghchaure Sep 8, 2020
0cb8053
Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payme…
rohitwaghchaure Sep 8, 2020
7131024
Merge branch 'develop' into item-group-filter-portal
anupamvs Sep 8, 2020
842cb6d
Update shift_assignment.py
rohitwaghchaure Sep 8, 2020
900d0e3
Merge pull request #23245 from Anurag810/attendance_calendar_map
rohitwaghchaure Sep 8, 2020
7d7fa79
Update additional_salary.py
rohitwaghchaure Sep 8, 2020
31fd901
Merge pull request #23243 from Anurag810/overlap_for_additional_salary
rohitwaghchaure Sep 8, 2020
9691422
feat: added report for mismatch in serial nos and stock quantity in w…
AfshanKhan Sep 8, 2020
f7619df
fix: Lock row in subquery while setting delivered qty (#23100)
ruchamahabal Sep 8, 2020
c8eca9d
Merge branch 'develop' into handle-irs
marination Sep 8, 2020
6932002
Merge pull request #23175 from AfshanKhan/handle-irs
marination Sep 8, 2020
12ab8eb
fix: removed ignore permission flag
AfshanKhan Sep 8, 2020
f7731b0
fix: TDS applicable on creating PI from get items button
deepeshgarg007 Sep 8, 2020
13483a3
Merge pull request #23291 from AfshanKhan/reverse-je-ignore-flag
marination Sep 8, 2020
09e2cb5
Merge branch 'develop' into item-group-filter-portal
anupamvs Sep 8, 2020
1d555f3
Merge pull request #23282 from deepeshgarg007/tds_bug
rohitwaghchaure Sep 8, 2020
93dccd2
Merge pull request #23132 from anupamvs/item-group-filter-portal
rohitwaghchaure Sep 8, 2020
8f43cf2
fix: asset movement date for backdated asset entry (#23298)
nextchamp-saqib Sep 8, 2020
f247686
fix: Amount for closed states
deepeshgarg007 Sep 8, 2020
846e6d4
fix: Add test
deepeshgarg007 Sep 8, 2020
dc84633
Merge pull request #23301 from deepeshgarg007/closed_loan_amount
deepeshgarg007 Sep 8, 2020
ec6a97f
fix: cannot delete pos page if linked with desk page (#22993)
nextchamp-saqib Sep 9, 2020
53cd60c
fix: Patch reload doctype
marination Sep 7, 2020
6520655
Merge branch 'develop' into youtube-analytics
marination Sep 10, 2020
1915a60
fix: education settings check
ruchamahabal Sep 10, 2020
2388199
Merge branch 'develop' into fix-student-email-id
ruchamahabal Sep 10, 2020
42bff32
Merge branch 'develop' into refactor-lab-module
ruchamahabal Sep 10, 2020
0a0e258
feat: Add Desk Page for Utilities for Video group
gavindsouza Sep 10, 2020
71ac399
fix: Commonified function and updated scheduler events
gavindsouza Sep 10, 2020
799d663
fix: Make set_youtube_statistics reusable and job logic fix
marination Sep 10, 2020
c0f9d1b
test: Lab Module
ruchamahabal Sep 10, 2020
a29436d
fix: codacy
ruchamahabal Sep 10, 2020
37b99d2
fix: Separate function to get bulk and single youtube stats
marination Sep 10, 2020
cd89994
fix: multiple pos issues (#23297)
nextchamp-saqib Sep 10, 2020
ed08e59
feat: added project in Sales Analytics report
anupamvs Sep 11, 2020
9533318
chore: Tests for Rename and Add child Account
marination Sep 11, 2020
1807437
Merge branch 'develop' into youtube-analytics
marination Sep 11, 2020
02c550c
fix: Redundant imports
marination Sep 11, 2020
60bfbbc
fix: use path istead of hook
barredterra Sep 11, 2020
8e41fdf
Merge branch 'develop' into website_theme_scss
barredterra Sep 11, 2020
41978ac
Merge branch 'develop' into datev_refactor
barredterra Sep 11, 2020
16f1435
fix: codacy
barredterra Sep 11, 2020
a91225f
inventory management link updated
kwabena53 Sep 11, 2020
0a68800
fix: Make sure Supplier/Customer is selected before fetching Items.
marination Sep 12, 2020
9205101
fix: Make Reference fields mandatory in Quality Inspection
marination Sep 12, 2020
7fc629b
Merge pull request #23316 from marination/quality-inspection-fields
rohitwaghchaure Sep 13, 2020
c4a8c9e
Merge branch 'develop' into pr-dn-get-items
marination Sep 14, 2020
59d20c7
Merge pull request #23315 from marination/pr-dn-get-items
marination Sep 14, 2020
026cf2d
Merge branch 'develop' into refactor-lab-module
ruchamahabal Sep 14, 2020
1751929
Merge pull request #22853 from ruchamahabal/refactor-lab-module
ruchamahabal Sep 14, 2020
93d7c2f
Merge pull request #23283 from ruchamahabal/fix-student-email-id
deepeshgarg007 Sep 14, 2020
6db92fb
feat: validate workflow before so/po update items (#23024)
nextchamp-saqib Sep 14, 2020
fcb6ba6
fix: get_transaction_entries function arguments in Bank Statement Tra…
ruchamahabal Sep 14, 2020
8cb356b
Merge branch 'develop' into sales-analytics
anupamvs Sep 14, 2020
b7cd841
fix: Revert tax calculation changes
marination Sep 15, 2020
36bc057
fix: Item GL entries for purchase invoice (#23027)
deepeshgarg007 Sep 15, 2020
65c2c4f
Merge branch 'develop' into item-tax-update-items
marination Sep 15, 2020
6131424
feat: uom in update items for SO & PO (#22869)
nextchamp-saqib Sep 15, 2020
4bb8d0c
chore: Test for PO
marination Sep 15, 2020
baedc62
Merge branch 'develop' into item-tax-update-items
marination Sep 15, 2020
665c27a
fix: Merge conflict missing line
marination Sep 15, 2020
bae2d5d
fix: review changes
anupamvs Sep 15, 2020
9397b7f
fix: requested changes
Anurag810 Sep 15, 2020
699e853
Merge branch 'develop' into sales-analytics
anupamvs Sep 15, 2020
4f3b7da
fix: set_taxes() missing 1 required positional argument: 'company'
rohitwaghchaure Sep 15, 2020
2f50cb3
fix: Supplier trigger onload
deepeshgarg007 Sep 15, 2020
a11d35c
Merge pull request #23331 from deepeshgarg007/tds_category_trigger
deepeshgarg007 Sep 15, 2020
f995f51
fix: Test
marination Sep 15, 2020
f63b671
Merge branch 'develop' into item-tax-update-items
marination Sep 15, 2020
db52cfe
Merge pull request #22849 from alyf-de/datev_refactor
deepeshgarg007 Sep 15, 2020
15f6982
Merge pull request #23079 from marination/item-tax-update-items
deepeshgarg007 Sep 15, 2020
5c04b2e
Merge pull request #23235 from Anurag810/custom_remark
deepeshgarg007 Sep 16, 2020
11649ef
Merge branch 'develop' into sales-analytics
anupamvs Sep 16, 2020
c78ca36
fix(Non Profit): Hide Address and Contact section for unsaved docs
ruchamahabal Sep 16, 2020
86864f5
Merge pull request #23345 from ruchamahabal/fix-address-contact
ruchamahabal Sep 16, 2020
2aea184
Merge pull request #23309 from anupamvs/sales-analytics
deepeshgarg007 Sep 17, 2020
e813684
fix: warehouse address filtered based on warehouse
AfshanKhan Sep 17, 2020
d5710b4
style: removed extra spaces
AfshanKhan Sep 17, 2020
6f3d93e
fix: Taxes not getting fetched from Opportunity to Quotation
deepeshgarg007 Sep 18, 2020
68672af
Fix missing tax autoload when frm.doc.taxes is []
SDLyu Sep 18, 2020
170ecdc
fix: No handlefor Cost centers in Accounts Receivable
Anurag810 Sep 18, 2020
bbc6aee
Merge pull request #23353 from SDLyu/patch-1
deepeshgarg007 Sep 18, 2020
c29ee69
fix: button click event not working in POS custom fields (#23358)
nextchamp-saqib Sep 18, 2020
cc6ca97
fix: Item-wise Sales History Report Error (#23349)
michellealva Sep 18, 2020
123eaea
fix: added new doctypes in get_level
abhishekbalam Sep 18, 2020
bf16673
fix: Batch-Wise Balance History filter validation
anupamvs Sep 18, 2020
4e67332
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23…
abhishekbalam Sep 18, 2020
0aff6d8
Update erpnext/public/js/utils/party.js
deepeshgarg007 Sep 19, 2020
095161f
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missin…
deepeshgarg007 Sep 19, 2020
e3ee63f
Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-addre…
deepeshgarg007 Sep 19, 2020
88f2394
Merge pull request #23311 from kwabena53/readme-links
deepeshgarg007 Sep 19, 2020
c646a56
fix: Update modified timestamp
deepeshgarg007 Sep 19, 2020
6bcfffd
Merge branch 'develop' into barredterra-patch-1
deepeshgarg007 Sep 19, 2020
ffdb9d0
Merge pull request #22966 from frappe/barredterra-patch-1
deepeshgarg007 Sep 19, 2020
4b25eb4
fix: mode of payment not fetched if no account is set (#23334)
nextchamp-saqib Sep 19, 2020
f2ea387
fix: depreciation start date ux fixes (#23339)
nextchamp-saqib Sep 20, 2020
5c8dd6a
Merge pull request #23355 from Anurag810/accounts_recievable
deepeshgarg007 Sep 20, 2020
c152b92
Update erpnext/controllers/selling_controller.py
deepeshgarg007 Sep 20, 2020
44c692e
Merge pull request #23278 from barry86m/patch-3
deepeshgarg007 Sep 20, 2020
97f61d2
fix: breadcrumbs for maintenance visit and schedule under support
abhishekbalam Sep 21, 2020
e42f080
fix: use Plaid's new API (develop) (#23318)
Alchez Sep 21, 2020
de7a2bc
fix: apply user permissions in tax accounts query
prssanna Sep 21, 2020
324cbe8
Merge pull request #23359 from abhishekbalam/activation
Sep 21, 2020
30dbfc3
Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance
Sep 21, 2020
e3c6128
fix(plaid): do not send null list in account ids (#23376)
Mangesh-Khairnar Sep 21, 2020
7230b0f
Merge pull request #23360 from anupamvs/batch-wise
rohitwaghchaure Sep 22, 2020
9e6d377
Merge pull request #23370 from prssanna/account-user-permission
rohitwaghchaure Sep 22, 2020
2b53b98
fix: reload dashboard (#23380)
scmmishra Sep 22, 2020
a0d192e
feat: Show searchfields in batch query
deepeshgarg007 Sep 22, 2020
d935b27
Merge branch 'develop' into youtube-analytics
gavindsouza Sep 22, 2020
27bccd7
Merge pull request #23397 from deepeshgarg007/search_field_batch_query
rohitwaghchaure Sep 22, 2020
6087fca
chore: Added video settings to List View Menu
marination Sep 22, 2020
639542c
Merge pull request #22867 from marination/youtube-analytics
gavindsouza Sep 22, 2020
1831893
fix: failed workflow condition error message in update items (#23393)
nextchamp-saqib Sep 23, 2020
fd15540
fix: Check if account exists in parent company on rename
marination Sep 23, 2020
8be51e2
fix: escape apostrophe in cost centre and project if exist
AfshanKhan Sep 23, 2020
8b78bf1
Merge branch 'develop' into website_theme_scss
barredterra Sep 23, 2020
879a8ef
fix: Change button label in Item (#23410)
michellealva Sep 23, 2020
f804eac
Merge branch 'develop' into fix-report-gp
marination Sep 23, 2020
5a4725c
Merge pull request #23409 from AfshanKhan/fix-report-gp
marination Sep 23, 2020
46d4180
refactor: Issue form cleaned up and renamed Minutes to First Response…
ruchamahabal Sep 23, 2020
fd42af5
fix: ignore permission while creating supplier scorecard period in su…
prssanna Sep 23, 2020
cfc5e29
fix: Post cancellation accounting entry on posting date instaed of cu…
deepeshgarg007 Sep 23, 2020
c077fac
feat: provision to draft quotation from portal
anupamvs Sep 23, 2020
cee891a
refactor: better logging for membership
scmmishra Sep 24, 2020
0bd8719
Merge branch 'develop' into better-logging-for-membership
scmmishra Sep 24, 2020
09775bb
feat: showing UOM even item price is hidden
anupamvs Sep 24, 2020
8370d9b
fix: Check Company in Payment Entry before selecting values
marination Sep 24, 2020
4816624
Merge pull request #23419 from marination/payment-entry-ux
marination Sep 24, 2020
4f395cc
chore: Add Filter Group to dialogs
marination Sep 24, 2020
a4df105
fix: UI fixes
anupamvs Sep 24, 2020
2fa2a40
chore: make asset movement transaction date match with purchase date …
nextchamp-saqib Sep 24, 2020
78ee75d
fix: review changes
anupamvs Sep 24, 2020
5a72022
Merge branch 'develop' of https://github.com/frappe/erpnext into quot…
anupamvs Sep 24, 2020
dd2f547
fix: Ui fixes
anupamvs Sep 24, 2020
7512565
fix: Patient Appointment not able to save (#23434)
rohitwaghchaure Sep 25, 2020
fec4ea5
fix: set stock uom in tem while creating material request from stock …
prssanna Sep 24, 2020
6e0c1ee
Merge branch 'develop' into quotation-portal
anupamvs Sep 25, 2020
382676d
Merge branch 'develop' into mr-stock-uom-v13
sagarvora Sep 27, 2020
0abcca8
Merge pull request #23436 from prssanna/mr-stock-uom-v13
deepeshgarg007 Sep 28, 2020
5b3af82
Update item_add_to_cart.html
anupamvs Sep 28, 2020
519a00c
fix: flushing contact details, generating assignment rule issues
anupamvs Sep 28, 2020
7b2f141
Merge pull request #23441 from anupamvs/lead-contact-detail
rohitwaghchaure Sep 28, 2020
21266fe
Merge branch 'develop' into website_theme_scss
barredterra Sep 28, 2020
ce39323
feat: Allow rich text edit for questions (#23402)
madar2020 Sep 28, 2020
77cf532
feat: open lead status on next contact date
anupamvs Sep 28, 2020
818522b
Merge branch 'develop' into dialog-filters
marination Sep 28, 2020
7e03c12
Merge pull request #23445 from anupamvs/lead-contact-date
marination Sep 29, 2020
3b610bd
Merge branch 'develop' into dialog-filters
marination Sep 29, 2020
202303e
Merge pull request #23422 from marination/dialog-filters
marination Sep 29, 2020
25f4c16
Merge branch 'develop' into account-add-rename
marination Sep 29, 2020
c33fbd7
Merge pull request #23416 from anupamvs/quotation-portal
deepeshgarg007 Sep 29, 2020
2b38361
Merge branch 'develop' of https://github.com/frappe/erpnext into tax_…
deepeshgarg007 Sep 29, 2020
661bf64
fix: Check only Read and Write Permission in Update Items
marination Sep 29, 2020
bc44bc6
fix: Add test
deepeshgarg007 Sep 29, 2020
42d8db5
fix: add currency select to Trial Balance
abhishekbalam Sep 29, 2020
001e7e9
fix: remove default value
abhishekbalam Sep 30, 2020
3ec6707
chore: use .format for message
scmmishra Sep 30, 2020
86171a3
fix: translate error log
scmmishra Sep 30, 2020
b04b53c
Merge branch 'develop' into better-logging-for-membership
scmmishra Sep 30, 2020
7aca810
Merge pull request #23418 from scmmishra/better-logging-for-membership
scmmishra Sep 30, 2020
8fbd960
Merge branch 'develop' into update-items-perm
marination Sep 30, 2020
6dc940f
Merge pull request #23457 from marination/update-items-perm
marination Sep 30, 2020
2331353
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance
deepeshgarg007 Sep 30, 2020
fc71e5b
fix: Remove any taxes fetched due to unknown rules
deepeshgarg007 Sep 30, 2020
287014a
fix: Remove any taxes fetched due to unknown rules
deepeshgarg007 Sep 30, 2020
b428e4c
fix: currency symbol in profit and loss report
rohitwaghchaure Sep 30, 2020
d65e050
Update profit_and_loss_statement.py
rohitwaghchaure Sep 30, 2020
db8764a
Merge pull request #23201 from alyf-de/website_theme_scss
netchampfaris Sep 30, 2020
70c0651
chore: Update translations
surajshetty3416 Oct 2, 2020
c213cd9
fix: Handle Blank from/to range in Numeric Item Attribute
marination Oct 2, 2020
262590b
Merge pull request #23481 from frappe-pr-bot/translations-2020-10-02-…
surajshetty3416 Oct 2, 2020
3c77a46
Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-i…
rohitwaghchaure Oct 3, 2020
5dc0432
chore: Update translations
surajshetty3416 Oct 3, 2020
38ccf82
fix: get_outstanding_invoices not ignoring the cancelled transactions
aakvatech Oct 3, 2020
01e986b
Merge pull request #23493 from frappe-pr-bot/translations-2020-10-03-…
surajshetty3416 Oct 3, 2020
f8bf139
Merge pull request #23498 from aakvatech/patch-3
deepeshgarg007 Oct 3, 2020
5bf35e4
Merge pull request #23220 from marination/account-add-rename
deepeshgarg007 Oct 4, 2020
2016a34
fix: naming series - cannot reset current value to zero (#23504)
nextchamp-saqib Oct 4, 2020
e7af9ff
fix: Show Project under Create button in SO
marination Oct 5, 2020
1fae774
fix: Search batches based on search fields
deepeshgarg007 Oct 5, 2020
ad2dd60
Merge pull request #23513 from deepeshgarg007/batch_search
rohitwaghchaure Oct 5, 2020
96fadb7
Merge pull request #23511 from marination/sales-order-project
rohitwaghchaure Oct 5, 2020
f58a5ec
fix: Codition in batch selector query
deepeshgarg007 Oct 5, 2020
bb61c77
Merge pull request #23514 from deepeshgarg007/batch_search_fix
rohitwaghchaure Oct 5, 2020
72a5969
fix: also update employee field when renamed (#23482)
sunhoww Oct 5, 2020
59ee417
Merge pull request #23483 from marination/item-attr
rohitwaghchaure Oct 6, 2020
f183dd6
Merge branch 'develop' into tax_fetch_quote
deepeshgarg007 Oct 6, 2020
b16e447
Merge pull request #23352 from deepeshgarg007/tax_fetch_quote
deepeshgarg007 Oct 6, 2020
ceb3e6e
build(deps): bump ini from 1.3.5 to 1.3.8
dependabot[bot] Jan 6, 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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 12 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"node": true,
"es6": true
},
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"extends": "eslint:recommended",
"rules": {
"indent": [
Expand Down Expand Up @@ -50,9 +54,9 @@
"root": true,
"globals": {
"frappe": true,
"Vue": true,
"erpnext": true,
"hub": true,

"$": true,
"jQuery": true,
"moment": true,
Expand Down Expand Up @@ -133,6 +137,12 @@
"get_server_fields": true,
"set_multiple": true,
"QUnit": true,
"Chart": true
"Chart": true,
"Cypress": true,
"cy": true,
"it": true,
"context": true,
"before": true,
"beforeEach": true
}
}
47 changes: 47 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
name: Bug report
about: Report a bug encountered while using ERPNext
labels: bug
---

<!--
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:

1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
- For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
- For documentation issues, refer to https://github.com/frappe/erpnext_com
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion.
3. When making a bug report, make sure you provide all required information. The easier it is for
maintainers to reproduce, the faster it'll be fixed.
4. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
-->

## Description of the issue

## Context information (for bug reports)

**Output of `bench version`**
```
(paste here)
```

## Steps to reproduce the issue

1.
2.
3.

### Observed result

### Expected result

### Stacktrace / full error message

```
(paste here)
```

## Additional information

OS version / distribution, `ERPNext` install method, etc.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Feature request
about: Suggest an idea to improve ERPNext
labels: feature-request
---

<!--
Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:

1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
- For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
- For documentation issues, refer to https://github.com/frappe/erpnext_com
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion.
3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.
-->

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/question-about-using-erpnext.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Question about using ERPNext
about: This is not the appropriate channel
labels: invalid
---

Please post on our forums:

for questions about using `ERPNext`: https://discuss.erpnext.com

for questions about using the `Frappe Framework`: ~~https://discuss.frappe.io~~ => [stackoverflow](https://stackoverflow.com/questions/tagged/frappe) tagged under `frappe`

for questions about using `bench`, probably the best place to start is the [bench repo](https://github.com/frappe/bench)

For documentation issues, use the [ERPNext Documentation](https://erpnext.com/docs/) or [Frappe Framework Documentation](https://frappe.io/docs/user/en) or the [developer cheetsheet](https://github.com/frappe/frappe/wiki/Developer-Cheatsheet)

> **Posts that are not bug reports or feature requests will not be addressed on this issue tracker.**
33 changes: 32 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,33 @@
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
<!--

Some key notes before you open a PR:

1. Select which branch should this PR be merged in?
2. PR name follows [convention](http://karma-runner.github.io/4.0/dev/git-commit-msg.html)
3. All tests pass locally, UI and Unit tests
4. All business logic and validations must be on the server-side
5. Update necessary Documentation
6. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes


Also, if you're new here

- Documentation Guidelines => https://github.com/frappe/erpnext/wiki/Updating-Documentation

- Contribution Guide => https://github.com/frappe/erpnext/blob/develop/.github/CONTRIBUTING.md

- Pull Request Checklist => https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist

-->

> Please provide enough information so that others can review your pull request:

<!-- You can skip this if you're fixing a typo or updating existing documentation -->

> Explain the **details** for making this change. What existing problem does the pull request solve?

<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->

> Screenshots/GIFs

<!-- Add images/recordings to better visualize the change: expected/current behviour -->
16 changes: 16 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Backport
on:
pull_request:
types:
- closed
- labeled

jobs:
backport:
runs-on: ubuntu-18.04
name: Backport
steps:
- name: Backport
uses: tibdex/backport@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
14 changes: 14 additions & 0 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Trigger Docker build on release
on:
release:
types: [released]
jobs:
curl:
runs-on: ubuntu-latest
container:
image: alpine:latest
steps:
- 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ erpnext/docs/current
*.swo
__pycache__
*~
.idea/
.vscode/
node_modules/
node_modules/
1 change: 1 addition & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
disable=access-member-before-definition
8 changes: 8 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.14.0
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
SNYK-JS-LODASH-450202:
- cypress > getos > async > lodash:
patched: '2020-01-31T01:35:12.802Z'
97 changes: 55 additions & 42 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,69 @@
language: python
dist: trusty

python:
- "2.7"
git:
depth: 1

services:
- mysql
cache:
- pip

addons:
hosts: test_site
mariadb: 10.3

jobs:
include:
- name: "Python 3.6 Server Side Test"
python: 3.6
script: bench --site test_site run-tests --app erpnext --coverage

- name: "Python 3.6 Patch Test"
python: 3.6
before_script:
- wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
- bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz
script: bench --site test_site migrate

install:
# fix mongodb travis error
- sudo rm /etc/apt/sources.list.d/mongodb*.list
- pip install flake8==3.3.0
- flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
- sudo rm /etc/apt/sources.list.d/docker.list
- sudo apt-get install hhvm && rm -rf /home/travis/.kiex/
- sudo apt-get purge -y mysql-common mysql-server mysql-client
- cd ~
- nvm install 10
- pip install python-coveralls
- wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
- sudo python install.py --develop --user travis --without-bench-setup
- sudo pip install -e ~/bench

- rm $TRAVIS_BUILD_DIR/.git/shallow
- bash $TRAVIS_BUILD_DIR/travis/bench_init.sh
- cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
- pip install frappe-bench

- git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
- bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench

- mkdir ~/frappe-bench/sites/test_site
- cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/

before_script:
- mysql -u root -ptravis -e 'create database test_frappe'
- echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
- echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
- mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
- mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"

- mysql -u root -e "CREATE DATABASE test_frappe"
- mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
- mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"

- mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
- mysql -u root -e "FLUSH PRIVILEGES"

- wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
- tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
- sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
- sudo chmod o+x /usr/local/bin/wkhtmltopdf
- sudo apt-get install libcups2-dev

- cd ~/frappe-bench

- sed -i 's/watch:/# watch:/g' Procfile
- sed -i 's/schedule:/# schedule:/g' Procfile
- sed -i 's/socketio:/# socketio:/g' Procfile
- sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile

- bench get-app erpnext $TRAVIS_BUILD_DIR
- bench use test_site
- bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes
- bench scheduler disable
- sed -i 's/9000/9001/g' sites/common_site_config.json
- bench start &
- sleep 10
- bench --site test_site reinstall --yes

jobs:
include:
- stage: test
script:
- set -e
- bench run-tests --app erpnext --coverage
after_script:
- coveralls -b apps/erpnext -d ../../sites/.coverage
env: Server Side Test
- # stage
script:
- wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
- bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
- bench migrate
env: Patch Testing
after_script:
- pip install coverage==4.5.4
- pip install python-coveralls
- coveralls -b apps/erpnext -d ../../sites/.coverage
13 changes: 13 additions & 0 deletions .travis/site_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"db_name": "test_frappe",
"db_password": "test_frappe",
"auto_email_id": "[email protected]",
"mail_server": "smtp.example.com",
"mail_login": "[email protected]",
"mail_password": "test",
"admin_password": "admin",
"root_login": "root",
"root_password": "travis",
"host_name": "http://test_site:8000",
"install_apps": ["erpnext"]
}
18 changes: 18 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,

manufacturing/ @rohitwaghchaure @marination
accounts/ @deepeshgarg007 @nextchamp-saqib
loan_management/ @deepeshgarg007 @rohitwaghchaure
pos* @nextchamp-saqib @rohitwaghchaure
assets/ @nextchamp-saqib @deepeshgarg007
stock/ @marination @rohitwaghchaure
buying/ @marination @deepeshgarg007
hr/ @Anurag810 @rohitwaghchaure
projects/ @hrwX @nextchamp-saqib
support/ @hrwX @marination
healthcare/ @ruchamahabal @marination
erpnext_integrations/ @Mangesh-Khairnar @nextchamp-saqib
requirements.txt @gavindsouza
20 changes: 0 additions & 20 deletions MANIFEST.in

This file was deleted.

Loading