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

39019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Summayya Hashmani
0806e32049
fix(ux): add naming series to ERPNext setting workspace (#28090) 
* fix(ux): add naming series to setting workspace

* fix: doctype link to naming series

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-10-27 11:46:10 +05:30
Saqib
879a1fca76
perf(minor): improve sales invoice submission (#27916) 
* perf: skip get_pricing_rules if no pricing rule exists

* perf: fetch mode of payments data in single query

* perf: get total company stock only for purchase order

* perf: skip insertion of stock ledger entry

* fix: undo changes to allow negative stock flag

* fix: sider

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-27 11:42:50 +05:30
Alan
05831b18ad
fix: update production plan status #27567 
fix: update production plan status
 2021-10-27 11:36:37 +05:30
mergify[bot]
25d1c1ce86
fix: add filter to query to avoid send reminder for zero years (#28092) (#28096) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 8cad23b8fb4d830a5703e107c371ae9319bc003d)

Co-authored-by: gsi-maruiz <62341390+gsi-maruiz@users.noreply.github.com>
 2021-10-27 11:21:26 +05:30
Dany Robert
2920f2f614
fix: change modified timestamp to apply changes on migrate #28095 
fix: change modified timestamp to apply changes on migrate
 2021-10-27 11:17:48 +05:30
Ankush Menat
479ecb8de0 test: picklist item grouping 2021-10-27 11:10:52 +05:30
Ankush Menat
6942900555 refactor: use defaultdict and enumeration 2021-10-27 11:10:52 +05:30
Diksha Jadhav
f2d136e574 feat(pick list): group items based on item code and warehouse before printing picklist 2021-10-27 11:10:52 +05:30
Ankush Menat
6ec047cba9
fix(ux): overbiling message in SO->SI, PO->PI (#28088) 2021-10-27 10:30:05 +05:30
Deepesh Garg
a87c201785
Merge pull request #28054 from deepeshgarg007/tax_withholding_category_filters 
fix(minor): Filters and validations in Tax Withholding Category
 2021-10-26 20:51:24 +05:30
Deepesh Garg
0c28b477af
Merge pull request #28074 from deepeshgarg007/pan_field_hide_develop 
fix: Move PAN field from standard doctype to fixtures for India
 2021-10-26 20:44:11 +05:30
Deepesh Garg
6b22894275
Merge pull request #28052 from deepeshgarg007/company_address_update 
fix: Auto update company address check on linking with company
 2021-10-26 20:40:13 +05:30
Deepesh Garg
277dfeaf4e
Merge pull request #28057 from deepeshgarg007/company_change_fixes 
fix: Update receivable/payable account on company change
 2021-10-26 20:36:52 +05:30
Deepesh Garg
0136aedfdc
Merge pull request #28055 from deepeshgarg007/payment_entry_ux 
fix(UX): Add mandatory depends on condition for reference no and date fields
 2021-10-26 20:02:34 +05:30
Deepesh Garg
1165a8ac3a
Merge branch 'develop' into company_change_fixes 2021-10-26 19:52:45 +05:30
Deepesh Garg
89d5e494dd fix: Reload customer and supplier doctype 2021-10-26 19:51:03 +05:30
Kenneth Sequeira
07a3be6f61
fix: remove VM from installation (#28075) 2021-10-25 20:10:52 +05:30
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices (#28042) 2021-10-25 13:18:08 +05:30
Deepesh Garg
cd4b20313e fix: Test case fixes and linting issues 2021-10-25 11:21:55 +05:30
Deepesh Garg
e3ae8d5a1e fix: Move PAN field from standard doctype to fixtures for India 2021-10-24 17:24:25 +05:30
Noah Jacob
fdaf93f76c
refactor: shows opening balance from filtered from_date (#26877) 
* refactor: shows opening balance from filtered from_date

* refactor: opening balance considered from filtered from_date in stock ledger

* fix: check if stock reco is opening and misc cleanups
 2021-10-23 21:04:42 +05:30
Deepesh Garg
35fe065cf1
Merge pull request #28070 from frappe/mergify/bp/develop/pr-28014 
fix: Error in TDS computation summary (backport #28014)
 2021-10-23 19:20:14 +05:30
Deepesh Garg
7f2dde7d94 fix: Check for supplier name 
(cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
881e091b85 fix: Check for other properties 
(cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
2ea4c95f86 fix: Error in TDS computation summary 
(cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)
 2021-10-23 07:47:18 +00:00
Ankush Menat
4ad2b851c4 chore: change semgrep rules repo name 
[skip ci]
 2021-10-22 22:39:11 +05:30
Ankush Menat
cc1baae5eb
ci: move semgrep rules out of repo (#28067) 
Moving semgrep rules out of repos as it's unnecessary to maintain
same ruleset for different repos and different branches.
 2021-10-22 21:43:50 +05:30
Raffael Meyer
2bdaf7bb23
fix: don't reset rates in Timesheet Detail when Activity Type is cleared (#28056) 
* fix: don't reset rates when activity type is cleared

* refactor: suggestions from review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* refactor: suggestions from review (fix)

* style: fix sider

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-10-21 23:53:04 +05:30
Deepesh Garg
65025fb628 fix: Update receivable/payable account on company change 2021-10-21 19:30:06 +05:30
Deepesh Garg
a20058a343 fix(minor): Add mandatory depends on condition for reference no and date fields 2021-10-21 17:52:13 +05:30
Deepesh Garg
7733afc0ae fix(minor): Filters and fixes in Tax Withholding Category 2021-10-21 16:13:00 +05:30
Deepesh Garg
c6d06816cf fix: Auto update company address check on linking with company 2021-10-21 15:37:59 +05:30
Alan
2849297471
refactor: move process loss report to manufacturing (#28043) 
* refactor: move process loss report to manufacturing

* test: fix process loss report test

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-21 11:07:47 +05:30
mergify[bot]
1a31d5856f
fix: useless validation message (#28029) (#28046) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 152f9b0a432361f1c801364d1c85c42a16691a8a)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2021-10-21 11:05:50 +05:30
Mohammed Yusuf Shaikh
03bfc77940
feat: employee initial work history updated when transfer is performed (#27768) 
* feat: employee initial work history updated when transfer is performed

* fix: sider

* fix: remove commit statement

* fix: tests and code formatting

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-21 10:15:09 +05:30
rohitwaghchaure
871cb1157f
fix: consolidated report issue #28035 
fix: consolidated report issue
 2021-10-20 21:08:15 +05:30
Rohit Waghchaure
311bafb23b fix: incorrect fieldname 2021-10-20 20:51:57 +05:30
Ankush Menat
da3635b94f test: execute manufacturing reports 2021-10-20 20:35:11 +05:30
Ankush Menat
126ba16740 fix: remove debug from query 2021-10-20 20:35:11 +05:30
Ankush Menat
8221e7e01f fix: remove employee_name from job card summary 
This field doesn't exist and it's moved on individual line level logs.
 2021-10-20 20:35:11 +05:30
Deepesh Garg
ddacff38ba
Merge pull request #28002 from ankush/dont_recompute_item_tax 
fix: dont recompute item wise taxes from front end
 2021-10-20 19:19:44 +05:30
Sagar Vora
8d9d0987fe
fix: incorrect status being set in Invoices (#28019) 
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
 2021-10-20 19:15:35 +05:30
Ankush Menat
5ada11b1af ci: run semgrep after basic linters 2021-10-20 19:09:57 +05:30
Ankush Menat
92c0dcc3ea ci: install dev requirements in CI 2021-10-20 19:09:57 +05:30
Rucha Mahabal
261f80c5ca
fix: avoid resetting employee on amending timesheets (#28025) 2021-10-20 16:58:32 +05:30
Nabin Hait
2ef4844a3c
feat: Tax for recurring additional salary (#27459) 
* fix: Logic for tax calculation on recurring additional salary

* fix: Get actual amount always in case of overwritten additional salary even if based on payment days

* feat: Test case added for recurring additional salary

* fix: use query builder to get additional salaries instead of raw SQL

* fix: query formatting and remove trailing spaces

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-20 15:50:30 +05:30
Jannat Patel
830fa60acd
Merge pull request #28018 from frappe/mergify/bp/develop/pr-27997 
fix: Employee filter in YTD and MTD in salary slip (backport #27997)
 2021-10-20 13:09:52 +05:30
Govind S Menokee
4f2cf43db7 YTD and MTD Messed up in Salary Slip 
The filter for YTD, MTD etc are based on employee name. This seems like an amateur mistake. It should be based on employee id.

(cherry picked from commit efc292a5ddc00e433d75b87d6b3378455bac4438)
 2021-10-20 07:11:26 +00:00
Jannat Patel
9a409df8fa
Merge pull request #27728 from itechstro/develop 
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation
 2021-10-20 12:27:22 +05:30
Jannat Patel
d81f811349
fix: map missing fields in opportunity (#27904) 2021-10-20 10:53:39 +05:30