Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,729 Commits 3 Branches 0 Tags 1 GiB
df93589032
Commit Graph

30729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
df93589032 fix: Ignore GL Entry on cancel 2020-06-07 21:29:25 +05:30
Deepesh Garg
3fed098f16 fix: Precision in loan amount calculation 2020-06-07 21:28:32 +05:30
Deepesh Garg
cb8ea6643e
Merge pull request #21441 from ruchamahabal/fix-attendance-message 
fix: show date in the message for already marked attendance
 2020-04-27 16:35:43 +05:30
Rucha Mahabal
e0ff9142ac fix: show date in the message for already marked attendance 2020-04-27 13:29:46 +05:30
rohitwaghchaure
cf86921edd
Merge pull request #21439 from ruchamahabal/fix-delivery-trip 
fix: Delivery Trip Form not Loading
 2020-04-27 12:33:23 +05:30
Rucha Mahabal
f40a431d8c fix: delivery trip form 2020-04-27 11:29:56 +05:30
Ahmad
f34faa9181
Module Import Fix (#21433) 2020-04-27 10:57:02 +05:30
Rucha Mahabal
131452ca94
fix: Lab Test Invoicing (#21435) 2020-04-27 10:52:38 +05:30
Rucha Mahabal
7bbe3dd8a0
fix: Patch for updating Appointment Reminder method in Scheduled Job Type (#21431) 2020-04-27 10:51:46 +05:30
Deepesh Garg
24b6055d89
Merge pull request #21427 from ruchamahabal/fix-desk-pages 
fix(Desk Page): Number of Open Leads not visible on Shortcut Card
 2020-04-27 08:41:14 +05:30
rohitwaghchaure
4b2d9b3679
Merge pull request #21386 from nextchamp-saqib/quo-status-fix 
fix: quotation have expired status even if sales order exists
 2020-04-27 05:18:35 +05:30
rohitwaghchaure
4d754eadc8
Merge branch 'develop' into quo-status-fix 2020-04-27 00:22:43 +05:30
Rucha Mahabal
e34ec70d44 fix(Desk Page): Number of Open Leads not visible on Shortcut Card 2020-04-26 23:40:37 +05:30
Nabin Hait
2305d00e0b
fix: Procurement tracker report (#21421) 
* fix: procurement report data was not coming

* fix: leave allocation minor issue
 2020-04-26 23:29:13 +05:30
Himanshu
c9a1aa8eaa
fix: add dashboard to quality inspection template (#21423) 2020-04-26 23:28:33 +05:30
Suraj Shetty
3e3a793567
fix: Set barcode field empty only if it has value (#21425) 
- To avoid unnecessary form dirty trigger
 2020-04-26 23:25:40 +05:30
Anurag Mishra
ded418e31d
feat: employee leave balance reports (#20754) 
* feat: Employee leave balance summary report new design

* feat: Employee leave balance report new design

* fix: leave based on multiple holiday list

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-26 21:04:58 +05:30
Nabin Hait
ba70e7e8bc
Payroll based on attendance (#21258) 
* feat: Payroll based on attendance and leave

* test: salary slip based 0n attendance

* feat: Payroll based on attendance

* fix: Codacy issues

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-04-26 20:17:48 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level (#20870) 
* feat: Allow tax withholding category selection at invoice level

* fix: Linitng fixes

* feat: TDS calculation using common PAN

* fix: Add provision to deduct Lower TDS in purchase invoice

* fix: Consider only ref docs company while computing TDS

* fix: Default permission fixes

* fix: Add validation for dates in fiscal year

* fix: Undefined variable
 2020-04-26 20:08:52 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup (#20932) 
* chore: Purchase Order Form Cleanup

* fix: Get Items from popups cleanup

* fix: Shift Set Target Warehouse next to Supply Raw Materials.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-26 20:07:22 +05:30
rohitwaghchaure
733b47c5e6
Merge pull request #21389 from marination/stock-entry-qty 
fix: Issues on qty trigger in Stock Entry Detail
 2020-04-26 17:59:45 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab (#21399) 
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-04-26 17:45:57 +05:30
Saqib Ansari
2fea073539 fix: query logic 2020-04-26 17:30:23 +05:30
marination
de33029393 fix: Remove callback outside if condition 2020-04-26 17:16:21 +05:30
Saqib
7e73473a65
fix: (ux) set jv voucher type depending on mode of payment (#21411) 2020-04-26 09:40:57 +05:30
rohitwaghchaure
8b1c71ea44
fix: work order creation message against material request (#21413) 2020-04-26 09:38:18 +05:30
rohitwaghchaure
9ab53c045e
Merge pull request #21325 from anupamvs/social-media-integration-feat 
feat: add twitter and linkedin integration
 2020-04-25 18:15:37 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) 
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
 2020-04-25 14:52:05 +05:30
Ahmad
454b1cf48d
Hook Fix in the scheduler events (#21410) 2020-04-25 14:51:24 +05:30
Deepesh Garg
0b7bef5971
Merge pull request #21408 from deepeshgarg007/loan_disbursement_against 
fix: Loan Disbursement against account
 2020-04-25 13:18:49 +05:30
Deepesh Garg
c20de8ac8d fix: Loan Disbursement against account 2020-04-25 13:15:45 +05:30
Saqib
8952ac1ab4
fix: custom buttons are hidden if order type of SO is customised (#21397) 2020-04-25 09:44:21 +05:30
rohitwaghchaure
55102f455f
Merge pull request #21401 from rohitwaghchaure/fixed-taget-warehouse-mandatory-issue 
fix: make target warehouse field mandatory while saving the work order
 2020-04-25 01:19:19 +05:30
rohitwaghchaure
3562d2762f
Merge pull request #21403 from DeeMysterio/dev-si-actual-qty 
feat(accounting): show actual qty for warehouse in sales invoice
 2020-04-25 01:18:20 +05:30
Anupam K
524eb6ce9b freeze screen while posting and login 2020-04-25 00:35:26 +05:30
Diksha Jadhav
7b91617303 feat(accounting): show actual qty for warehouse in sales invoice 2020-04-25 00:02:32 +05:30
Rohit Waghchaure
5460691c8f fix: make target warehouse field mandatory while saving the work order 2020-04-24 23:55:33 +05:30
Rucha Mahabal
d124581044
Merge pull request #21384 from anupamvs/email-camp-end-date 
fix: set end_date in Email Campaign
 2020-04-24 20:04:34 +05:30
rohitwaghchaure
7fe0748641
Merge pull request #21396 from nextchamp-saqib/price-rule-fix-deve 
fix: rate gets overwritten when pricing rule is set
 2020-04-24 16:47:09 +05:30
Saqib Ansari
8c70e8d4df fix: remove debugger 2020-04-24 16:41:48 +05:30
Saqib Ansari
40140c63dc fix: rate gets overwritten when pricing rule is set 2020-04-24 14:51:56 +05:30
Saqib Ansari
22d2970339 fix: query 2020-04-24 13:47:44 +05:30
Saqib
869ea1d9e4
Merge branch 'develop' into quo-status-fix 2020-04-24 12:17:30 +05:30
Anupam K
e01723e360 Review changes 2020-04-23 23:02:08 +05:30
marination
e1e98fe116 fix: Issues on qty trigger in Stock Entry Detail 2020-04-23 20:18:52 +05:30
Rucha Mahabal
1700fc8011
Merge branch 'develop' into email-camp-end-date 2020-04-23 19:42:17 +05:30
Saqib Ansari
0f2c64cfef fix: travis 2020-04-23 19:19:09 +05:30
Anurag Mishra
92b933f4ac
feat: Upload Attendance (#20947) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:15:18 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms (#20945) 
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:07:36 +05:30