Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,161 Commits 3 Branches 0 Tags 1 GiB
293f6cbafd
Commit Graph

39161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
293f6cbafd fix: Sider, Linter and Server Side Test 
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt
 2021-11-16 14:36:15 +05:30
marination
e9c75d6eea test: Purchase Invoice Received Qty 2021-11-16 11:55:34 +05:30
marination
05ec7cce82 test: Purchase Receipt Received Qty 2021-11-15 17:49:14 +05:30
marination
afe1c45f7f fix: Sider + Fields UX 
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
 2021-11-15 17:17:29 +05:30
marination
5fb5a757cf refactor: (ux) Accepted/Rejected/Received Qty UX 2021-11-08 13:23:42 +05:30
Ankush Menat
db3193dcab
chore: remove migration_hash (#28263) 2021-11-08 10:57:20 +05:30
mergify[bot]
c0b889b94d
fix: auto update price list rate (#28255) (#28256) 
* fix: auto update price list rate

* fix: hide field when auto insert isn't enabled

(cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e)

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>

[skip ci]
 2021-11-07 17:42:51 +05:30
Ankush Menat
aed45f22f4
Merge pull request #28249 from ankush/dead_code 
chore: py2 compatibility code cleanup
 2021-11-05 11:55:55 +05:30
Ankush Menat
37e6e1f330 chore: ignore six removal commit in blame 2021-11-05 11:28:31 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
56a25a0c4f chore: drop future from requirements.txt 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
mergify[bot]
25f647f067
fix: Bulk update of valid upto field wasn't working (bp #28242) 
* fix: Bulk update of valid upto field wasn't working

Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem.

* chore: extend fix and cleanup whitespace

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

Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>
 2021-11-04 21:46:48 +05:30
Raffael Meyer
114028e473
feat: replace newline in remarks (DATEV report) (#28152) 2021-11-04 21:44:24 +05:30
Suraj Shetty
30a6f03ad3
Merge pull request #28192 from revant/build-on-rel 
ci: migrate docker to github actions
 2021-11-03 18:08:17 +05:30
Noah Jacob
cb064b06ad
fix: added job_card_item link in material request (#28222) 
* fix: added job_card_item links in material request

* fix: add no copy to row references
 2021-11-03 11:53:57 +00:00
Revant Nandgaonkar
c2697bca76 ci: change GITHUB_PAT to CI_PAT 2021-11-03 13:52:37 +05:30
Saqib
a5902fa3f8
Merge pull request #28187 from hrwX/subscription_active_fixes 
fix: do not generate multiple invoices
 2021-11-03 11:40:39 +05:30
Deepesh Garg
11e90cc0be
Merge pull request #28205 from deepeshgarg007/lower_deduction_validation_fix 
fix: Error on LDC creation
 2021-11-02 20:27:18 +05:30
Deepesh Garg
66348e1a03 fix: Error on LDC creation 2021-11-02 20:26:40 +05:30
Marica
91112c49e1
Merge pull request #28202 from marination/serial-no-popup-with-scanner 
fix: Serial Nos not set in the row after scanning in popup
 2021-11-02 20:17:48 +05:30
hrwx
2bce193b81 Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes 2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
marination
734b57deec fix: Serial Nos not set in the row after scanning in popup 
- Avoid whitspaces while calculating length of serial nos
 2021-11-02 18:34:55 +05:30
Noah Jacob
857d87da97
fix: replaced "=" with "in" for multiple statuses in query #28193 
fix: replaced "=" with "in" for multiple statuses in query
 2021-11-02 17:52:45 +05:30
Saqib
7681600b5e
fix: test wdv method for indian region 2021-11-02 17:47:44 +05:30
hrwx
890a786858 fix: do not generate multiple invoices 2021-11-02 11:58:01 +00:00
GangaManoj
f047c6ffc8 fix: Test for WDV 2021-11-02 16:43:31 +05:30
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 2021-11-02 16:28:46 +05:30
Marica
11c0b37658
Merge pull request #28195 from marination/se-batch-filter 
fix: (ux) Remove warehouse filter on Batch field for Material Receipt
 2021-11-02 16:09:32 +05:30
marination
48886ee705 chore: Add comment above fix for future reference 2021-11-02 15:57:41 +05:30
marination
048210a8f6 fix: Remove warehouse filter on Batch field for Material Receipt 2021-11-02 15:49:58 +05:30
Revant Nandgaonkar
c587f18735 chore: migrate docker to github actions 2021-11-02 12:09:41 +05:30
Ankush Menat
27cbeb920e test(patch): run patch tests for major releases 
Run patch tests one at a time
v10 db -> v12-> v13 -> .... -> frappe:corresponding base branch and PR.
 2021-11-01 17:44:46 +05:30
Ankush Menat
1eab3a44f6 fix(ux): stock levels take time after item merge 
Item merge creates a repost and depending on number of entries it can
take from 1 to n hours for it to finish. (depending upon queued up
reposts)

Added message so users don't feel confused till this operation is
finished.
 2021-11-01 15:32:59 +05:30
Ankush Menat
f7ffe04a4b fix: use warehouse to find company 2021-11-01 14:13:56 +05:30
Ankush Menat
a0727b2e82 fix: pass company while fetching valuation rate 
If company is not supplied and valuation rate is 0, then default
company is used for checking if perpetual inventory is enabled or not.
This makes little sense as different companies can have different
setting for perpetual inventory.
 2021-11-01 14:13:56 +05:30
Anupam Kumar
623776dd48
feat: added company field in prospect (#28139) 
* feat: added company field in prospect

* fix: review changes
 2021-11-01 13:37:31 +05:30
Deepesh Garg
ddcdf64f35
Merge pull request #28156 from kennethsequeira/ind-tx 
fix: update tax template name for 18% GST
 2021-10-31 18:53:40 +05:30
rohitwaghchaure
69dd8b7c3f
Merge pull request #28168 from rohitwaghchaure/fixed-patch-update_category_in_ltds_certificate 
fix: patch update_category_in_ltds_certificate
 2021-10-31 09:56:45 +05:30
Rohit Waghchaure
cae29b71d8 fix: patch update_category_in_ltds_certificate 2021-10-31 09:24:07 +05:30
Deepesh Garg
fb9e72cc8a
Merge pull request #28162 from deepeshgarg007/pan_field_missing_error 
fix: Error for missing PAN no field
 2021-10-30 19:29:26 +05:30
Deepesh Garg
541c892f97 fix: Error for missing PAN no field 2021-10-30 18:22:46 +05:30
Kenneth Sequeira
ad5cf467c0
fix: update tax template name for 18% GST 2021-10-30 13:07:36 +05:30
Anuja Pawar
1a6e98ed48
fix(Payment Reconciliation): clear child tables on company/party change (#28008) 2021-10-29 20:52:47 +05:30
Ganga Manoj
15e9b5170d
fix: Make status filter optional (#28126) 2021-10-29 18:07:11 +05:30
Deepesh Garg
eb720d18c3
Merge pull request #28145 from deepeshgarg007/coa_import_is_group 
fix: COA importer importing all accounts as group
 2021-10-29 17:04:20 +05:30
Ankush Menat
ff9cfe0d14 fix: sort by creation to break tie 2021-10-29 16:56:15 +05:30
Ankush Menat
f4b60a48f5 refactor: simplify sr no fetching 2021-10-29 16:56:15 +05:30