nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-20 01:55:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,097 Commits 404 Branches 1,702 Tags
68d7b773145aa3798e06cd22e91054e46fd22eef
Commit Graph

30097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
68d7b77314 fix: Utils messsage cleanup 2020-04-27 11:16:39 +05:30
Deepesh Garg
93e8b5d87e fix: E-way bill fix in List view 2020-04-27 11:15:23 +05:30
Deepesh Garg
6b082b5edb fix: E-way bill fix in sales invoice 2020-04-27 11:15:04 +05:30
Rucha Mahabal
093720b870 fix: add hook for sending appointment reminders in v12 (#21432) 2020-04-27 10:36:11 +05:30
Rucha Mahabal
e1697fd9cc Merge pull request #21429 from akurungadam/patch-2 
fix: name 'patient' is not defined
 2020-04-27 00:42:39 +05:30
Anoop
c2f952045c fix: name 'patient' is not defined 
possible escape while refactoring, fixed in develop added here.

Reported via -
https://discuss.erpnext.com/t/healthcare-outpatient-sms-alert-error/60812
 2020-04-27 00:33:26 +05:30
Nabin Hait
2b5bca4ce6 fix: Procurement tracker report (#21422) 
* fix: procurement report data was not coming

* fix: leave allocation minor issue
 2020-04-26 23:28:54 +05:30
Himanshu
de6f0f7a05 fix: add quality inspection template (#21424) 2020-04-26 23:27:29 +05:30
Anurag Mishra
1f3584b9a8 refactor: employee leave balance report v12 (#21282) 
* fix: Employee Balance repor fixes

* refactor: Employee Leave Balance report For Version-12

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-26 21:05:09 +05:30
Deepesh Garg
5bfdf0af4d feat: Allow tax withholding category selection at invoice level (#20871) 
* 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:10:16 +05:30
rohitwaghchaure
14a50a9403 Merge pull request #21390 from marination/stock-entry-qty-hotfix 
fix: Issues on qty trigger in Stock Entry Detail
 2020-04-26 18:00:07 +05:30
marination
b724fec6c9 fix: Remove callback outside if condition 2020-04-26 17:18:41 +05:30
Nabin Hait
1d5ea4feee feat: Income tax slab (#21406) 
* 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 12:37:52 +05:30
Saqib
7fedff260d fix: (ux) set jv voucher type depending on mode of payment (#21412) 2020-04-26 09:41:02 +05:30
rohitwaghchaure
9fc78e44ea Merge pull request #21402 from DeeMysterio/hotfix-si-actual-qty 
feat(accounting): show actual qty for warehouse in sales invoice
 2020-04-25 01:19:04 +05:30
Diksha Jadhav
be97087d32 feat(accounting): show actual qty for warehouse in sales invoice 2020-04-24 21:09:59 +05:30
Rucha Mahabal
b0f829e541 Merge pull request #21381 from anupamvs/email-camp-end-date-hotfix 
fix: set end_date in Email Campaign
 2020-04-24 20:44:18 +05:30
Rucha Mahabal
0455a96dcd Merge branch 'version-12-hotfix' into email-camp-end-date-hotfix 2020-04-24 20:04:55 +05:30
Deepesh Garg
d771ba2895 Merge pull request #21398 from nextchamp-saqib/tax-breakup-for-cn-v12 
fix: show positive taxes in credit notes
 2020-04-24 19:01:46 +05:30
rohitwaghchaure
c8e5b42dba Merge pull request #21395 from nextchamp-saqib/price-rule-fix 
fix: rate gets overwritten when pricing rule is set
 2020-04-24 16:46:47 +05:30
Saqib Ansari
424dbef139 fix: rate gets overwritten when pricing rule is set 2020-04-24 16:40:03 +05:30
Saqib Ansari
6256ca81b1 fix: show positive taxes in credit notes 2020-04-24 16:01:11 +05:30
marination
fda451f3e3 fix: Issues on qty trigger in Stock Entry Detail 2020-04-23 20:35:18 +05:30
Rucha Mahabal
2307385210 Merge branch 'version-12-hotfix' into email-camp-end-date-hotfix 2020-04-23 19:42:04 +05:30
Deepesh Garg
bd4b5da11b feat: Payment allocation based on payment terms (#20946) 
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:09:08 +05:30
Anupam K
ef7f9c6ecc Review changes 2020-04-23 13:45:19 +05:30
Anupam K
097c643a59 setting end date in email campaign 2020-04-23 12:29:00 +05:30
Deepesh Garg
dd560d676e fix: Budget against accounting dimensions (#21269) 
* fix: Budget warning against custom accounting dimension

* fix: Codacy
 2020-04-23 10:35:35 +05:30
rohitwaghchaure
794fd75ca1 fix: bom update cost is not working (#21348) 
* fix: bom update cost is not working

* added test case for bom cost
 2020-04-23 09:48:31 +05:30
rohitwaghchaure
f49e66e721 fix: BOM stock report (#21377) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 09:45:26 +05:30
rohitwaghchaure
8fd1e08763 fix: incorrect out value in stock balance due to precision issue (#21378) 2020-04-23 09:44:54 +05:30
rohitwaghchaure
f2c43ca81e fix: patch and validation message to fix target warehouse issue (#21359) 2020-04-22 16:08:36 +05:30
Deepesh Garg
9d6ee99d99 Merge pull request #21368 from scmmishra/cal-report-12 
fix: specify column width
 2020-04-22 12:03:35 +05:30
Shivam Mishra
0578cf5a73 fix: specify column width 2020-04-22 11:53:18 +05:30
Michelle Alva
499f9198b9 fix: better error message due date (#21366) 2020-04-22 11:37:09 +05:30
Deepesh Garg
4daab871d5 Merge pull request #21354 from anupamvs/error-message-changes-hotfix 
fix: Add better error message
 2020-04-22 09:28:16 +05:30
Deepesh Garg
17585710b2 Merge pull request #21360 from rohitwaghchaure/fixed-unsupported-operand-type-issue 
fix: unsupported operand type issue in pricing rule
 2020-04-22 08:43:29 +05:30
Rohit Waghchaure
56e7887511 fix: unsupported operand type issue in pricing rule 2020-04-22 02:45:55 +05:30
Anupam K
08c782709a Better error message 2020-04-21 17:03:56 +05:30
Anupam Kumar
fb20982194 fix: on item change UOM not updated (#21254) 
* fix: on item change UOM not updated

* removing uom from js
 2020-04-21 12:57:08 +05:30
Marica
9453add3dd fix: Re-order Item Error Email format (#21343) 
* fix: Re-order Item Error Email format

* fix: Translated strings
 2020-04-21 12:53:17 +05:30
rohitwaghchaure
c62cf98d7e fix: scrap items order not showing correctly in stock entry (#21347) 2020-04-21 11:26:49 +05:30
rohitwaghchaure
ea8e302833 Merge pull request #21339 from scmmishra/issue-list-context-12 
fix: filters as dictionary
 2020-04-21 01:25:34 +05:30
rohitwaghchaure
5d3fd9dc43 Merge pull request #21344 from rohitwaghchaure/fixed_free_item_qty_hotfix 
fix: free item quantity issue
 2020-04-21 01:08:13 +05:30
rohitwaghchaure
c9ba147615 Merge pull request #21323 from marination/pick-list-enhance-hotfix 
Pick list enhance hotfix
 2020-04-21 01:07:50 +05:30
Rohit Waghchaure
7ef57533ec fix: free item quantity issue 2020-04-21 00:19:19 +05:30
gavin
712abe4cd2 Merge pull request #21338 from gavindsouza/tally-migration-fixes-v12 
fix: Tally migration
 2020-04-20 19:30:40 +05:30
Shivam Mishra
1a93977ef7 fix: filters as dictionary 2020-04-20 13:56:20 +05:30
Gavin D'souza
fc078c1d45 style: removed unused imports and updated formatting 2020-04-20 12:57:59 +05:30
Gavin D'souza
77532b96b8 fix: strip data fields of whitespaces 2020-04-20 12:57:48 +05:30