Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,623 Commits 3 Branches 0 Tags 1 GiB
9ae0380a96
Commit Graph

38623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items (#27021) 2021-08-24 12:18:40 +05:30
Ankush Menat
0dff0beaba
fix: stock analytics report date range issues and add company filter (#27014) 
* test: tests for correct get_period_date_ranges

* fix: stock analytics report date range issues

- Upon selecting second half of month with Monthly filter, data from
  that period was missing.
- Solution: "round down" the date as per expected frequency.

* chore: drop py2 and fix misleading docstring

* test: fix test to avoid FY clash

* feat: add company filter in stock analytics report

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-24 12:16:46 +05:30
rohitwaghchaure
6106a635f8
Merge branch 'develop' into fix-scrap-items-updation 2021-08-24 12:10:04 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on instead of code (#27008) 2021-08-24 12:07:38 +05:30
rohitwaghchaure
db385261f0
Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom 
fix: stock ledger report not working if include UOM selected in filter
 2021-08-24 10:16:35 +05:30
rohitwaghchaure
95866b736e
Merge pull request #27081 from rohitwaghchaure/fixed-donot-overrride-batch-no 
fix: batch no reset on changing of qty
 2021-08-24 10:15:36 +05:30
Anupam
4a529f8039 feat: Prospect 2021-08-24 09:35:59 +05:30
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom 2021-08-24 08:50:49 +05:30
Rushabh Mehta
dd3372a3a5
Merge pull request #27089 from frappe/revert-26604-salary-component-account-filter 
Revert "fix: Salary component account filter"
 2021-08-24 08:34:21 +05:30
Rushabh Mehta
49e0a4f287 Revert "fix: Salary component account filter (#26604)" 
This reverts commit ae9d1d9617.
 2021-08-24 08:33:57 +05:30
GangaManoj
46650cce0d fix: Calculate total buying_amount and gross profit for each invoice 2021-08-23 21:17:32 +05:30
Deepesh Garg
bd709f8ab0 fix: Ignore due date validations if payment terms are copied from orders/receipts 2021-08-23 19:05:52 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no 2021-08-23 18:07:22 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop 
fix: Multiple fixes in payment entry
 2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 (#27083) 2021-08-23 15:38:26 +05:30
Rohit Waghchaure
e1f070437a fix: selected batch no changed on updation of qty 2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4 fix: stock ledger report not working if include uom selected in filter 2021-08-23 13:36:13 +05:30
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 (#27044) 2021-08-23 11:17:31 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue (#26872) 2021-08-23 11:05:07 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop 2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary (#27069) 2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values (#26975) 2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc 2021-08-20 20:42:50 +05:30
Saqib
ec258551bf
fix: flaky test for SLA (#27051) 2021-08-20 19:09:31 +05:30
GangaManoj
d1453c0cd0 fix: Remove Item Code and Item Name columns 2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc fix: Display Items in the format Item Code: Item Name 2021-08-20 18:25:36 +05:30
Alan
62c590261c
refactor: rectify typo (#27057) 
[skip ci]
 2021-08-20 18:21:09 +05:30
18alantom
810bce8da2 Merge branch 'develop' into update-stock-onboarding-fp 2021-08-20 16:31:27 +05:30
18alantom
f4487c3ae5 refactor: use Form Tour doc instead of controller form tour 
note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings
 2021-08-20 16:25:20 +05:30
18alantom
77ebbdd172 fix: minor changes 
- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight
 2021-08-20 16:21:33 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company (#26923) 
* fix: Cascade deletion for Company
 2021-08-20 14:40:12 +05:30
18alantom
6ef16ee4fb fix: update scrap table item details; typo 2021-08-20 12:24:13 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Nabin Hait
b8c998119b
Merge pull request #27040 from marination/cart-pl-exchange-rate 
fix: Shopping cart Exchange rate validation
 2021-08-20 10:56:10 +05:30
Nabin Hait
12d7f83998
Merge pull request #27033 from noahjacob/ux_promo_scheme_fix 
fix(ux): removed rate from grid view
 2021-08-20 10:51:59 +05:30
Nabin Hait
657e61ae6d
Merge pull request #27028 from noahjacob/prompt_warehouse_fix 
fix: incorrect mandatory error message for warehouse
 2021-08-20 10:48:34 +05:30
GangaManoj
b5fac83987 fix: Add items belonging to Product Bundles as children 2021-08-20 06:07:53 +05:30
GangaManoj
33f100d75d fix: Set initial_depth to 3 2021-08-20 06:06:47 +05:30
GangaManoj
97a1d426a3 fix: Assign indent and parent_invoice 2021-08-20 03:54:19 +05:30
GangaManoj
779a1d68a5 fix: Make Invoice row bold 2021-08-20 02:38:34 +05:30
GangaManoj
5ffaff8e48 fix: Display items as descendants of invoices 2021-08-20 02:20:18 +05:30
GangaManoj
17a154017b fix: Display data in tree form 2021-08-20 02:19:18 +05:30
GangaManoj
76921137ed fix: Return data as dict if the report is grouped by Invoice 2021-08-20 02:16:49 +05:30
marination
8046d15ef0 chore: Comment out obsolete test 
- Modifying this test means considering extreme edge cases, which seems pointless now
 2021-08-19 21:10:30 +05:30
Noah Jacob
f13315809e
refactor: renamed varint_item_code to variant_item_code (#27025) 2021-08-19 20:28:30 +05:30
marination
45617ae22f fix: Shopping cart Exchange rate validation 
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
 2021-08-19 20:01:05 +05:30
Alan
9225f02599
fix: pass planned start date to created work order (#27031) 
* fix: pass planned start date to created workorder

* test: production plan to work order start date

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-19 18:49:20 +05:30
Saqib Ansari
8e79c48db8 fix: remove unwanted filter query 2021-08-19 18:10:02 +05:30
Saqib Ansari
71e7254184 test: creation of advance entry on invoice submission 2021-08-19 18:09:35 +05:30