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

30749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
f382257fc7
Merge pull request #21509 from ruchamahabal/fix-healthcare-v13-beta 
fix: Healthcare Fixes
 2020-04-30 15:30:02 +05:30
Suraj Shetty
bd849f5925
Merge branch 'version-13-beta-pre-release' into fix-healthcare-v13-beta 2020-04-30 15:03:39 +05:30
Deepesh Garg
b134abd3bd
Merge pull request #21513 from deepeshgarg007/get_period_api_v13 
fix: get_period_list API change fixes
 2020-04-29 22:23:15 +05:30
Deepesh Garg
7c2d50fa15 fix: Remove print 2020-04-29 22:19:15 +05:30
Deepesh Garg
9d5fabd7ac fix: get_period_list API change fixes 2020-04-29 22:19:02 +05:30
Rucha Mahabal
57fc3a5c3c fix: exercise type 2020-04-29 19:49:46 +05:30
Rucha Mahabal
5e8f748a63 feat: add create Sales Invoice option from Therapy Session 2020-04-29 19:49:31 +05:30
Rucha Mahabal
cf10fde5ec fix: mark form as dirty when editing or deleting exercise card 2020-04-29 19:49:15 +05:30
Rucha Mahabal
589440c5ad feat: create medical record for therapy sessions 2020-04-29 19:48:58 +05:30
Rucha Mahabal
033886ae3e fix: change Patient Medical Record subject fieldtype to Text Editor 2020-04-29 19:48:41 +05:30
Rucha Mahabal
b30c9a5735 fix: reload procedure doc on completion 2020-04-29 19:48:17 +05:30
Deepesh Garg
c544b91e14
Merge pull request #21495 from deepeshgarg007/item_wise_sale_purchase_v13 
fix: Group by filter fix in item wise sales and purchase register
 2020-04-29 12:37:26 +05:30
Deepesh Garg
60256e7299 fix: Group by filter fix in item wise sales and purchase register 2020-04-29 12:26:47 +05:30
rohitwaghchaure
7e430384bc
Merge pull request #21480 from marination/stock-ledger-report-v13-beta 
fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report
 2020-04-29 01:49:35 +05:30
marination
769145caba fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report 2020-04-28 21:36:25 +05:30
Deepesh Garg
e317b79361
Merge pull request #21478 from deepeshgarg007/duplicate_code_v13 
fix: Remove duplicate code from accounting dimension
 2020-04-28 20:36:50 +05:30
Deepesh Garg
7889ca564c fix: Remove duplicate code from accounting dimension 2020-04-28 20:32:32 +05:30
Deepesh Garg
43ade21f1e
Merge pull request #21462 from deepeshgarg007/consolidate_statement_fix_v13 
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
 2020-04-28 13:30:25 +05:30
Deepesh Garg
c26db6a606 fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:16:49 +05:30
Marica
ac98eb5448
fix: Blanket Order in SO/PO child tables (#21443) 2020-04-28 13:00:44 +05:30
Deepesh Garg
85bbb04fa1
Merge pull request #21460 from deepeshgarg007/gross_profit_width_v13 
fix: Default column width in Gross profit report
 2020-04-28 12:36:14 +05:30
Deepesh Garg
bc346b5bea fix: Default column width in Gross profit report 2020-04-28 12:30:41 +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