nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 14:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,804 Commits 457 Branches 1,744 Tags
340859cb3c2bed7bc7e56ddbb7a0e4e0ce9ff93c
Commit Graph

38804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
13d2e7b198 fix: Deferred revenue entries post account freezing 
(cherry picked from commit e2eb72eb5b)
 2021-09-30 03:06:00 +00:00
rohitwaghchaure
104d107659 Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis 
fix: added project name in the purchase order analysis
 2021-09-29 23:41:31 +05:30
Rohit Waghchaure
c1f9997a67 fix: added project name in the purchase order analysis 2021-09-29 23:26:19 +05:30
Saqib
a84cd2674c Merge branch 'develop' into trim-custom-field-length 2021-09-29 19:56:56 +05:30
Saqib Ansari
f1fcb385f5 patch: trim sales invoice custom field lengths 2021-09-29 19:56:02 +05:30
Deepesh Garg
b39f8a6215 fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) 
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs

* fix: Ignore user permission for fiscal year company
 2021-09-29 15:54:35 +05:30
Dany Robert
2b4959fb3b fix: return tax rate since fetch is removed 2021-09-29 13:01:40 +05:30
Saqib
0b040c7437 fix: cannot delete a project if linked with sales order (#27536) 2021-09-28 18:13:01 +05:30
Saqib
424efd41e5 feat(regional): toggle for reduced depreciation rate as per IT Act (#27600) 2021-09-28 18:12:02 +05:30
Alan
72c081fd8f fix: apply price list after batch or serial no insertion (#27566) 2021-09-28 12:56:26 +05:30
Alan
b91333afdd fix: set item.qty as mandatory in picklist (#27680) 2021-09-28 06:41:37 +00:00
Noah Jacob
5c249decbb fix(ux): added exception of template item in filters (#27560) 2021-09-27 22:34:27 +05:30
Deepesh Garg
cc5dd5c67d feat: TDS deduction using journal entry and other fixes (#27451) 
* fix: TDS deduction using journal entry

* fix: Multi category application against single supplier

* refactor: TDS payable monthly report

* fix: Server side handling for default tax withholding category

* fix: Supplier filter for Journal Entry

* refactor: TDS computation summary report
 2021-09-27 21:43:20 +05:30
marination
596cf3951d fix: Batch scans get overwritten on the same row 2021-09-27 15:06:46 +05:30
Saqib
b68ac24cd5 chore: add shipping address in eway bill test (#27662) 2021-09-27 15:03:58 +05:30
Saqib
f2fca59ba7 fix: cannot set custom label for 'total' field in print format (#27664) 2021-09-27 14:28:16 +05:30
Shariq Ansari
18918e1b4f chore: linter fix 2021-09-27 14:08:44 +05:30
Saqib Ansari
a7df4227da fix: trim sales invoice custom field lengths 2021-09-27 13:56:16 +05:30
Shariq Ansari
0de735f20b fix: Fixed alignment of Title, Subtitle, Action Button 2021-09-27 13:50:19 +05:30
Saqib
9fa24ffccc Merge pull request #27659 from nextchamp-saqib/fix-32644 
fix: setting of gain/loss if party account is in company currency
 2021-09-27 13:05:19 +05:30
Saqib
711395db22 fix: linting errors 2021-09-27 12:26:18 +05:30
Saqib
1f8ad72418 fix: indentation 2021-09-27 12:21:06 +05:30
Saqib
30f59b09fd chore: log modified invoices 2021-09-27 12:20:16 +05:30
ChillarAnand
765a9bb731 refactor: Remove sales invoice custom js related to healthcare 2021-09-27 07:34:54 +05:30
Saqib Ansari
18e5d59d24 fix: unknown column 'ref_exchange_rate' 2021-09-26 20:26:45 +05:30
Dany Robert
5ce6a4c107 fix: tax rate being overridden in case of 0.00 
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually. 
But fetching used to override the rate(upon saving) and mess up the amount.
 2021-09-26 18:31:27 +05:30
Saqib
e8ff649298 Merge branch 'develop' into fix-32644 2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b chore: hide exchange gain loss if empty 2021-09-26 17:07:13 +05:30
Saqib Ansari
beebfb323a patch: invalid gain loss gl entry 2021-09-26 16:58:55 +05:30
Saqib
f8c1c73953 fix: local variable 'fiscal_year_details' referenced before assignment (#27656) 2021-09-26 16:27:56 +05:30
Saqib Ansari
78ad50efc2 fix: cost center in exchange gain loss gl entry 2021-09-26 16:08:15 +05:30
Saqib Ansari
dd2d039ca8 chore: hide exchange gain loss if empty 2021-09-26 15:51:03 +05:30
Saqib Ansari
64efe8bf15 fix: setting of gain/loss if party account is in company currency 2021-09-26 15:46:13 +05:30
escix
dafe99b6e2 fix: holiday message reminder 
Minor grammatical change
 2021-09-26 11:09:13 +05:30
Sagar Vora
c8b9a55e96 feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +05:30
Frappe PR Bot
2af6ea68ae fix: remove unknown field employee_name from query (bp #27634) 
* fix: remove unknown field employee_name from query

* fix: remove unknown fieldname

Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
 2021-09-21 20:33:09 +05:30
Ankush Menat
c302c7ab42 fix: remove bad default for anniversary reminders (#27632) 
🤦
 2021-09-21 17:51:46 +05:30
Marica
9110223341 fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628) 
- Set subassemply WO's planned start date from Production Plan
 2021-09-21 16:50:14 +05:30
Kenneth Sequeira
abded895f3 fix: update default KSA VAT rate for setup (#27614) 2021-09-21 10:58:18 +05:30
François de Ryckel
5c400da4e2 Update training_result.js (#27615) 
cur_frm is deprecated
 2021-09-21 09:29:15 +05:30
Abdullah A. Zaqout
6d8e869a92 fix(pos): check if item exists before fetching available qty (#27581) 2021-09-20 21:35:37 +05:30
Anuja Pawar
190c2d84da fix: reference row added in allocation table (#27602) 2021-09-20 21:32:38 +05:30
Shariq Ansari
3e8e6ac4e2 fix: Creating unique hash for slider id instead of slider name 2021-09-20 20:52:08 +05:30
Ankush Menat
4f01115f2f Merge pull request #27601 from ankush/overbill_warn 
fix(ux): warn when overbilling allowance was bypassed due to role
 2021-09-20 17:42:29 +05:30
Ankush Menat
21a955d20b fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-20 17:14:35 +05:30
Ankush Menat
5e4fbba753 refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.
 2021-09-20 16:40:51 +05:30
Ankush Menat
43bf82b58b fix: warn when overbilling checks are skipped. 2021-09-20 16:31:20 +05:30
Subin Tom
0ff7367f39 fix: Tax Breakup table headers fix (#27596) 2021-09-20 16:13:36 +05:30
Saqib
ef66beec51 fix(plaid): query to check if bank account exists 2021-09-20 15:33:29 +05:30
ChillarAnand
aa580769a6 chore: Code clean up 2021-09-20 15:27:43 +05:30