nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,278 Commits 404 Branches 1,700 Tags
0cf3ab326424e761dcafe68923e4ff452b4d68ce
Commit Graph

38278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
8fd1aec76c fix: employee advance return through multiple additional salaries (#27470) 
* fix: employee advance return through multiple additional salaries (#27438)

* fix: employee advance return through multiple additional salaries

* test: test repay unclaimed amount from salary

* fix: sorting in imports

(cherry picked from commit b98740b44a)

* fix: remove naming rule

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-14 12:01:19 +05:30
Deepesh Garg
9708bf3750 fix: Linting Issues 2021-09-14 12:01:02 +05:30
Deepesh Garg
173ae56aec fix: Test Case 2021-09-14 12:01:02 +05:30
Deepesh Garg
f101241907 fix: Hardcode fiscal year and posting date 2021-09-14 12:00:35 +05:30
Deepesh Garg
0bb16b6b59 fix: Debug CI 2021-09-14 12:00:35 +05:30
Deepesh Garg
7d61181f8b test: Update test case 2021-09-14 12:00:09 +05:30
Deepesh Garg
e8edeecc05 fix: Linting and patch fixes 2021-09-14 12:00:09 +05:30
Deepesh Garg
5c9f2bf4a4 fix: Advance TDS test case 2021-09-14 12:00:09 +05:30
Deepesh Garg
dab0fe56f1 feat: Validity dates in Tax Withholding Rates 2021-09-14 12:00:08 +05:30
Frappe PR Bot
52a99d8da6 fix: editable price list rate field in sales transactions (#27455) (#27461) 
(cherry picked from commit a5baf909b7)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-13 18:48:05 +05:30
Frappe PR Bot
64796d3029 fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27453) 
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349)

* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component

* fix: set component amount precision at the end

* fix: consider default amount during taxt calculations

* test: component amount dependent on another payment days based component

* fix: test

(cherry picked from commit bab644a249)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py

* fix: conflicts in test file

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-13 15:13:43 +05:30
Saqib
bb8d90d741 feat: (get_items_from) filter material request item in purchase order (#24725) 2021-09-13 11:46:00 +05:30
Ankush Menat
5c1f0c98f8 Revert "fix: Salary component account filter (#26605)" (#27446) 
This reverts commit aaea5edbdb.
 2021-09-13 10:09:01 +05:30
Frappe PR Bot
00c4e346c7 fix(ux): clean invalid fields from variant setting (#27442) 
* fix(ux): clean invalid fields from variant setting (#27412)

(cherry picked from commit 6ef879fca2)

# Conflicts:
#	erpnext/stock/doctype/item_variant_settings/item_variant_settings.js

* fix: resolve conflicts

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-12 16:41:31 +05:30
Frappe PR Bot
74fa6fab4c fix(ux): apply proper filtering in stock reports (#27411) (#27443) 
* fix(ux): apply proper filtering in stock reports

Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field

* fix: unnecessary parens

Co-authored-by: Alan <2.alan.tom@gmail.com>
(cherry picked from commit d743c41b54)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-12 16:41:17 +05:30
Sagar Vora
dd352df168 Merge pull request #27437 from frappe-pr-bot/backport/version-13-hotfix/27433 
fix: Template Error due to use of single quote
 2021-09-11 17:59:03 +05:30
Sagar Vora
0ecaf23722 fix: Template Error due to use of single quote (#27433) 
(cherry picked from commit dae0a1c1d6)
 2021-09-11 12:25:27 +00:00
Devin Slauenwhite
becf471a3a fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430) 
* fix: fail migration due to None type

* fix: incorrect key: value pair in filter.

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-11 12:22:49 +00:00
Frappe PR Bot
8337ec9fe0 test: basic tests for controllers/queries (bp #27422) 
(cherry picked from commit 62fc544280)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-10 13:09:16 +05:30
Ankush Menat
a33de1bdfe chore: remove snyk from dev-dependencies (#27425) 2021-09-10 13:08:06 +05:30
Frappe PR Bot
3b7e981ccd fix: fetch customers and billing email in PSOA (#27418) 2021-09-09 21:31:16 +05:30
Saqib
3cac39c584 fix: pos payment mode selection issue (#27409) (#27417) 2021-09-09 19:36:01 +05:30
Ankush Menat
a6a564c43d chore: whitespace (#27416) 2021-09-09 19:16:21 +05:30
Frappe PR Bot
0950e246c3 refactor: .doc missing and empty row on new doc (#27408) (#27414) 
* refactor: .doc missing and empty row on new doc

* fix: let -> const

(cherry picked from commit acdb10377f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-09-09 19:13:06 +05:30
Marica
ef4b1dba26 Merge pull request #27401 from deepeshgarg007/website_item_patch 
fix: Website item patch fixes
 2021-09-09 16:57:11 +05:30
Frappe PR Bot
b1eb0c5c75 fix: added Show Remarks checkbox in AR & AP reports (#27374) (#27404) 
(cherry picked from commit 3576668638)

Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com>
 2021-09-09 14:26:31 +05:30
Deepesh Garg
064ce90e8c Merge pull request #27261 from frappe-pr-bot/backport/version-13-hotfix/27143 
feat: Taxjar Integration update
 2021-09-09 13:16:01 +05:30
Frappe PR Bot
5126b3f93e fix: job card overlap unknown column jc.employee (#27403) (#27405) 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests

(cherry picked from commit 678335f8ac)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-09 12:45:25 +05:30
Frappe PR Bot
81dbf1ed00 fix: added delivery date filters to get sales orders in production plan (#27367) (#27397) 
(cherry picked from commit 295020451f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-09 12:20:49 +05:30
Deepesh Garg
70c5533646 fix: Website item patch fixes 2021-09-09 09:47:18 +05:30
Frappe PR Bot
fea6291399 fix: document naming rule not working for subscription invoices (#27395) 2021-09-08 19:11:47 +05:30
Subin Tom
47c548a070 Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27143 2021-09-08 17:20:20 +05:30
Frappe PR Bot
2d3c036070 fix: auto complete sales order rows in production plan (#27352) (#27396) 
* fix: auto complete sales order rows in production plan

* fix: sider

(cherry picked from commit 81d3524d27)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-08 16:52:43 +05:30
Frappe PR Bot
30e02f092d fix: General Ledger translation issues (#27298) (#27392) 
* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

(cherry picked from commit fa819f2fb0)
 2021-09-08 16:41:41 +05:30
Frappe PR Bot
67174ef1b3 fix: scan barcode fields input length (#27390) 
* fix: scan barcode fields input length (#27389)

* fix: undo unintentional changes

* fix: scan barcode fields input length

* fix: undo barcode field length change

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>

(cherry picked from commit df3e4ce1c0)
 2021-09-08 16:22:35 +05:30
Ganga Manoj
7dce900ff5 Merge branch 'version-13-hotfix' into backport-fix-selling-settings 2021-09-07 20:51:47 +05:30
Saqib
d7e7a5519a fix(SLA): select options for 'Pause SLA On' (#27376) 2021-09-07 18:45:26 +05:30
GangaManoj
d623eac084 fix: Move related fields to the same section 2021-09-07 17:32:01 +05:30
GangaManoj
c128618185 fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle' 2021-09-07 17:05:20 +05:30
GangaManoj
d67460bf22 fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked 2021-09-07 17:04:29 +05:30
GangaManoj
7f1d611b47 fix: Remove redundant description 2021-09-07 17:04:04 +05:30
Marica
4727bf5806 Merge pull request #27381 from frappe-pr-bot/backport/version-13-hotfix/27358 
fix: Check if Item is serialised before trying to fetch SN and set SO in it
 2021-09-07 15:11:53 +05:30
Marica
29e0d315db Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27358 2021-09-07 15:01:13 +05:30
Frappe PR Bot
5e97d1b620 ci: fix docs checker for wiki based docs (#27380) (#27382) 
(cherry picked from commit 5596988c94)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-07 14:57:37 +05:30
Marica
255155c5b8 fix: Check if Item is serialised before trying to fetch SN and set SO in it (#27358) 
(cherry picked from commit 61a1356109)
 2021-09-07 09:13:34 +00:00
Frappe PR Bot
454630f2bd fix: missed to add voucher_type, voucher_no to get GL Entries (#27368) (#27378) 
* fix: missed to add voucher_type, voucher_no to get gl entries

* test: get voucherwise details utilities


Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>

(cherry picked from commit 058d98342a)
 2021-09-07 13:00:18 +05:30
Saqib
40fa4cf77c fix: 'NoneType' has no attribute 'name' (#27375) 2021-09-07 12:13:22 +05:30
Ganga Manoj
e8eb137cd4 fix: update Selling Settings (#27364) 2021-09-07 11:42:26 +05:30
Frappe PR Bot
821d55b0e0 fix: employee remider settings (#27365) (#27366) 
(cherry picked from commit 88c9fe35bd)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2021-09-07 00:20:38 +05:30
Frappe PR Bot
1708e8b7ce fix: patch failure for vat audit report (#27355) (#27357) 
(cherry picked from commit 14b01619de)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-06 13:51:18 +05:30