CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-10 22:06:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,554 Commits 410 Branches 1,717 Tags
ed89963d65e5f9934ff63d33d116ba3de3100d9a
Commit Graph

40554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
ed89963d65 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-31223 2022-06-06 12:24:34 +05:30
Deepesh Garg
281fe34457 Merge pull request #31236 from frappe/mergify/bp/version-13-hotfix/pr-31231 
fix(India): Supplies from composite dealer not showing up (backport #31231)
 2022-06-06 12:24:20 +05:30
Deepesh Garg
d07014340f Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-31223 2022-06-06 11:50:30 +05:30
Deepesh Garg
fa0984f192 Merge pull request #31234 from frappe/mergify/bp/version-13-hotfix/pr-31218 
fix(India): GSTIN filter in GSTR-1 report (backport #31218)
 2022-06-06 11:45:41 +05:30
Deepesh Garg
3ea2c95768 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-31223 2022-06-06 10:42:48 +05:30
Deepesh Garg
23d94c135f Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-31231 2022-06-06 10:42:41 +05:30
Deepesh Garg
66bc9a974e Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-31218 2022-06-06 10:42:28 +05:30
Deepesh Garg
91716e9c26 Merge pull request #31238 from frappe/mergify/bp/version-13-hotfix/pr-31217 
ci: stale apt cache (backport #31217)
 2022-06-06 10:06:41 +05:30
Ankush Menat
2db12d7bfa ci: stale apt cache (#31217) 
(cherry picked from commit c7efa3b44d)
 2022-06-06 04:03:14 +00:00
Devin Slauenwhite
f4a4dacb22 chore: linter 
(cherry picked from commit b061ea4cd2)
 2022-06-06 03:37:41 +00:00
Devin Slauenwhite
ef22337a9b fix: display currencies in validation message. 
(cherry picked from commit 3a1c923e76)
 2022-06-06 03:37:40 +00:00
Deepesh Garg
15712c742b fix(India): Supplies from composite dealer not showing up 
(cherry picked from commit db07831db7)
 2022-06-06 03:30:59 +00:00
Deepesh Garg
abe9fe70ce fix(India): GSTIN filter in GSTR-1 report 
(cherry picked from commit f0ac394d6e)
 2022-06-06 03:28:38 +00:00
mergify[bot]
b31709c793 fix: Pluralize year text instead of optional bracket (backport #31210) (#31212) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
 2022-06-01 16:47:02 +05:30
mergify[bot]
3a718c7d5f fix: re-validate warehouse after 'update items' (backport #31203) (#31206) 
fix: re-validate warehouse after 'update items' (#31203)

(cherry picked from commit c84e11ac82)

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-06-01 15:24:55 +05:30
mergify[bot]
8b985d632f test: fix attendance tests for unmarked days (backport #31205) (#31208) 
test: fix attendance tests for unmarked days (#31205)

* test: fix attendance tests for unmarked days

* chore: remove unused import

(cherry picked from commit 536f1dfc4b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-06-01 14:15:59 +05:30
mergify[bot]
4aeb448fea fix: remove leave policy assignment creation patch (backport #31097) (#31204) 
* fix: remove leave policy assignment creation patch (#31097)

(cherry picked from commit d4b9cc0242)

# Conflicts:
#	erpnext/patches.txt

* chore: fix conflicts

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-06-01 12:46:17 +05:30
Deepesh Garg
910ab405ae Merge pull request #31188 from frappe/mergify/bp/version-13-hotfix/pr-31088 
feat(india): Check E-way Bill Status before Cancellation. (backport #31088)
 2022-05-31 21:41:54 +05:30
Rucha Mahabal
cdb884bbf2 fix: conflicts 2022-05-31 13:11:32 +05:30
Rucha Mahabal
2c26ab599a test: HRA Exemption in Proof Submission 
(cherry picked from commit ed1ba677d6)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
bb04e4b6de fix: amount precision for Tax Exemption Proof Submission 
(cherry picked from commit cfe2f8cac1)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
66deee1582 test: set country to India before running regional tests 
(cherry picked from commit 2e98e9e0b9)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
1e728df54c fix: Tax Declaration tests and amount precision 
(cherry picked from commit 00adda7c8d)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
c1f6f11e91 test: HRA Exemption in Employee Tax Exemption Declaration 
(cherry picked from commit 5e96a46c87)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
b1e119d97d fix: component pay calculation 
(cherry picked from commit 2b65c9616f)
 2022-05-31 13:11:32 +05:30
Rucha Mahabal
de8f5f87d0 fix: HRA Exemption calculation in case of multiple salary structure assignments 
(cherry picked from commit 34925a3a8c)

# Conflicts:
#	erpnext/regional/india/utils.py
 2022-05-31 13:11:32 +05:30
maharshivpatel
622d25e126 feat(india): Improve E-way Bill Cancellation. (#31088) 
(cherry picked from commit a8f98f3f96)
 2022-05-31 06:45:23 +00:00
Deepesh Garg
99917af73f Merge pull request #31156 from frappe/mergify/bp/version-13-hotfix/pr-30850 
fix(pos): freeze screen while processing pos invoices (backport #30850)
 2022-05-31 10:56:32 +05:30
Deepesh Garg
698c9ed3bc Merge pull request #31186 from frappe/mergify/bp/version-13-hotfix/pr-31127 
feat: Auto accrue loan interest for backdated term loans (backport #31127)
 2022-05-31 10:28:38 +05:30
Deepesh Garg
3344823b7d Merge pull request #31185 from frappe/mergify/bp/version-13-hotfix/pr-31184 
fix(accounts): Ignore Cancelled GL Entries (backport #31184)
 2022-05-31 10:28:27 +05:30
Deepesh Garg
89c4d518e1 feat: Auto accrue loan interest for backdated term loans 
(cherry picked from commit 96d8b1ef3c)
 2022-05-31 04:28:29 +00:00
Mitchy25
d8531f20a0 Ignore Cancelled GL Entries 
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.

(cherry picked from commit a0c412a0dd)
 2022-05-31 04:19:35 +00:00
Rucha Mahabal
2fe54e5435 chore: add Interview doctypes to HR workspace (#31181) 2022-05-30 18:26:20 +05:30
mergify[bot]
0759a8aee3 chore: remove unused bill no & date from purchase receipt (backport #31163) (#31177) 
chore: remove unused bill no & date from purchase receipt (#31163)

(cherry picked from commit 08bf0baaae)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-05-30 15:50:04 +05:30
mergify[bot]
50d338df30 feat: provision to exclude exploded items in the BOM (backport #29450) (#31174) 
* feat: provision to exclude exploded items in the BOM (#29450)

(cherry picked from commit b75b00fefc)

* fix(ux): "New Version" button BOM

"duplicate" technically creates a new version but that's not intuitive
at all.

* fix: only erase BOM when do_not_explode is set

* fix: allow non-explosive recrusive BOMs

Recursion should be allowed as long as child item is not "exploded"
further by a BOM.

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-30 15:43:49 +05:30
Ankush Menat
eb8d30fe06 chore: remove framework tests from erpnext 
Similar tests exist in FW and this is failing because someone updated
the translations
 2022-05-30 15:42:34 +05:30
mergify[bot]
7767dc1ee3 chore: update translation fr for BOM (backport #31126) (#31165) 
* chore: update translation fr for BOM (#31126)

* fix: update translation

* fix: fr translation for BOM

(cherry picked from commit ce8e05146e)

* chore: format

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-29 22:10:46 +05:30
mergify[bot]
f19747cee0 fix: date filter on quality inspection report (backport #31148) (#31164) 
fix: date filter on quality inspection report (#31148)

* fix: date filter

fix from date to to date filter btw those days

* fix: remove unnecessary conditions

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 7ff8acac51)

Co-authored-by: MOHAMMED NIYAS <76736615+niyazrazak@users.noreply.github.com>
 2022-05-27 17:32:24 +05:30
Rucha Mahabal
b98f3647ec Merge pull request #31162 from frappe/mergify/bp/version-13-hotfix/pr-31160 
fix: Gratuity status not updated on salary slip submission (backport #31160)
 2022-05-27 15:49:08 +05:30
Rucha Mahabal
c02a89db4d fix: conflicts 2022-05-27 15:30:29 +05:30
Rucha Mahabal
6aa6114757 fix: conflicts 2022-05-27 15:11:49 +05:30
Rucha Mahabal
30cbe8feb6 test: make holiday list before running gratuity tests 
(cherry picked from commit c9e070393d)
 2022-05-27 09:36:21 +00:00
Rucha Mahabal
e4426addeb fix: add list view settings for Gratuity 
(cherry picked from commit 79b0aede00)

# Conflicts:
#	erpnext/payroll/doctype/gratuity/gratuity.json
 2022-05-27 09:36:21 +00:00
Rucha Mahabal
b5d66877d8 refactor: clean-up gratuity tests 
(cherry picked from commit 6c66bbbbfe)

# Conflicts:
#	erpnext/payroll/doctype/gratuity/test_gratuity.py
 2022-05-27 09:36:20 +00:00
Rucha Mahabal
00a6bc7970 test: Gratuity status for payment via salary slip 
(cherry picked from commit b81d7519c1)

# Conflicts:
#	erpnext/payroll/doctype/gratuity/test_gratuity.py
 2022-05-27 09:36:20 +00:00
Rucha Mahabal
0a014edd7a fix: Gratuity status not updated on salary slip submission 
(cherry picked from commit 385e22a067)
 2022-05-27 09:36:19 +00:00
Deepesh Garg
f820d8d35e Merge pull request #31157 from frappe/mergify/bp/version-13-hotfix/pr-31155 
fix: Exchange rate reste to 1 on making mapped doc (backport #31155)
 2022-05-27 12:18:26 +05:30
Deepesh Garg
91863c7457 fix: Exchange rate reste to 1 on making mapped doc 
(cherry picked from commit 2a10f09d8d)
 2022-05-27 06:47:35 +00:00
mergify[bot]
f40100d483 fix(india): duplicate qrcode and hide button (#31154) 2022-05-27 12:16:47 +05:30
HarryPaulo
a7bf236c28 fix(pos): freeze screen while processing pos invoices (#30850) 
(cherry picked from commit 4b04694c2c)
 2022-05-27 06:46:26 +00:00