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

29419 Commits

Author SHA1 Message Date
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
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices (#28042) 2021-10-25 13:18:08 +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
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
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
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
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
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
Chillar Anand
73ae504721
fix(healthcare): Add patch for removing healthcare doctypes (#27995) 
* fix(healthcare): Add patch for healthcare doctypes

* fix: Update healthcare patch

* fix: Reload stale doctypes

* fix: Reload doc fix
 2021-10-19 18:59:23 +05:30
Deepesh Garg
21ba9ac744 fix: Totals row incorrect value in GL Entry (#27867) 
(cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)
 2021-10-19 09:38:40 +00:00
Ankush Menat
393749a611
fix: dont recompute item wise taxes from front end 2021-10-19 14:13:34 +05:30
Noah Jacob
e08a0992b2
Merge branch 'develop' into maint_schedule_fix 2021-10-19 13:12:45 +05:30
Noah Jacob
af1b9e100e fix: changes in schedules gets overwritten on save 2021-10-19 12:08:32 +05:30
Himanshu
7717b99edb
feat: add enabled field in UOM (#27993) 2021-10-19 10:19:40 +05:30
Rucha Mahabal
8eacaddde7
fix: flaky Org Chart Test (#27971) 2021-10-18 11:06:16 +05:30
Deepesh Garg
9c54d6df13
Merge pull request #27967 from deepeshgarg007/account_name_number_error 
fix: Account number and name incorrectly imported using COA importer
 2021-10-18 09:16:09 +05:30
Deepesh Garg
46e80095c6
Merge pull request #27934 from deepeshgarg007/tds_round_off_error 
fix: TDS round off not working from second transaction
 2021-10-18 08:53:37 +05:30
Deepesh Garg
30e6f4dfed
Merge pull request #27970 from deepeshgarg007/gstr_1_interstate_internal_transfer 
fix (India): Interstate internal transfer invoices not visible in GSTR-1
 2021-10-18 08:52:41 +05:30
Deepesh Garg
b7a08535b5 fix: TDS round off not working from second transaction 2021-10-16 20:58:24 +05:30
Deepesh Garg
d9d42b13ab fix: Interstate internal transfer invoices not visible in GSTR-1 2021-10-16 17:09:37 +05:30
Deepesh Garg
17a8649500 fix: Account number and name incorrectly import using COA importer 2021-10-15 21:19:41 +05:30
Subin Tom
f3cf36f613
fix: POS Profile payment methods table (#27956) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-15 12:39:52 +05:30
Marica
c0e632842a
Merge pull request #27962 from marination/clean-serial-no-logic 
fix: Retain space inside Serial no string while cleaning serial nos
 2021-10-14 20:17:42 +05:30
Ankush Menat
4437eb0c4b
fix: remove bad description (#27963) 2021-10-14 20:03:37 +05:30
marination
a9341672cf test: Include serial no with spaces in it in sanitation test 2021-10-14 19:49:13 +05:30
Marica
8cf188d9c0
fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-10-14 19:21:41 +05:30
marination
41035b0330 fix: Retain space inside Serial no string while cleaning serial nos 2021-10-14 18:31:37 +05:30
Ankush Menat
9c1d828b1b
chore: formatting 2021-10-14 17:18:24 +05:30
rohitwaghchaure
1233725b64
Merge pull request #27957 from rohitwaghchaure/patch-to-enable-scheduler-job 
fix: patch to enable scheduled job for reposting
 2021-10-14 17:14:43 +05:30
rohitwaghchaure
230a5d4b39
Update enable_scheduler_job_for_item_reposting.py 2021-10-14 16:57:54 +05:30