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

30972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
fa2eecc5fc fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:12:22 +05:30
rohitwaghchaure
28a4880b48
fix: added validation to not allow to select expired batch (#21455) 2020-04-28 13:01:43 +05:30
Marica
299e217668
fix: Blanket Order in SO/PO child tables (#21442) 2020-04-28 13:00:04 +05:30
rohitwaghchaure
daf37e7570
fix: better validation message for the expense claim and set default cost center in the expenses table (#21454) 2020-04-28 12:48:22 +05:30
Deepesh Garg
558f6aa4cb
Merge pull request #21456 from deepeshgarg007/gross_profit_width 
fix: Default column width in Gross profit report
 2020-04-28 12:35:50 +05:30
Deepesh Garg
142af4b58a fix: Default column width in Gross profit report 2020-04-28 11:17:45 +05:30
Nabin Hait
504a5f3a3a
fix: reload income_tax_slab_other_charges in patch (#21447) 
* fix: reload income_tax_slab_other_charges in patch

* fix: reload lower_deduction_certificate in patch
 2020-04-28 11:16:04 +05:30
rohitwaghchaure
236c28fc91
Merge pull request #21453 from anupamvs/campaign-card 
Added Campaign Card in CRM Desk
 2020-04-28 03:04:12 +05:30
Anupam K
01d0b373e0 Review changes 2020-04-28 00:21:10 +05:30
Anupam K
cc9dbb912e Adding campaign card in CRM Desk 2020-04-27 22:37:02 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message 
fix: E-Way bill error message
 2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53 fix: Test 2020-04-27 14:05:45 +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
Wolfram Schmidt
acfe8f020f
added time stamp to commit 
added time stamp to commit
 2020-04-27 08:48:34 +02:00
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
4eecc65cff fix: E-way bill fix in Delivery Note 2020-04-27 10:50:59 +05:30
Deepesh Garg
00ea59b447 fix: Utils messsage cleanup 2020-04-27 10:50:40 +05:30
Deepesh Garg
10aff8e118 fix: E-way bill fix in List view 2020-04-27 10:50:17 +05:30
Deepesh Garg
9979ceb96b fix: E-way bill fix in sales invoice 2020-04-27 10:50:03 +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
Wolfram Schmidt
64c7eeed24
Update in field type 
Warrenty Period (in Days) changed from "Data" to "Int".
 2020-04-26 10:56:08 +02:00
Abhishek Balam
8aa8457a2d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-26 13:07:09 +05:30
Abhishek Balam
e4e23836e7 mandatory depends on for cheque no and date, fix typo 2020-04-26 13:06:55 +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
Abhishek Balam
c1fdac219a Merge branch 'develop' of https://github.com/abhishekbalam/erpnext into develop 2020-04-26 05:03:24 +05:30
Abhishek Balam
84187fb8e9 Code cleanup and improvements requested in PR:21404 2020-04-26 05:00:36 +05:30
Abhishek Balam
84bd2e69d8
Merge branch 'develop' into develop 2020-04-26 04:59:09 +05:30
Abhishek Balam
331bc0c366 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 18:25:27 +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
Abhishek Balam
539c67966f rename je template account dt 2020-04-25 18:13:01 +05:30
Abhishek Balam
fb5fbd7e0c Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-04-25 17:59:00 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30