rohitwaghchaure
388293dbea
Merge pull request #29280 from rohitwaghchaure/company-filter-issue-for-default-account
...
fix: accounts are coming from different company in the dropdown
2022-01-13 21:11:55 +05:30
Shariq Ansari
dd56bf205a
fix: fixed card for buying workspace
2022-01-13 20:19:49 +05:30
Shariq Ansari
469bddcadf
fix: minor fix
2022-01-13 19:50:26 +05:30
Deepesh Garg
24bb1e8987
fix: Test case
2022-01-13 19:44:26 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Ankush Menat
be0a4412d3
chore: update label rules
2022-01-13 17:19:59 +05:30
Marica
343f517740
Merge pull request #29271 from marination/allow-multiple-fg-in-repack
...
fix: Don't validate FG in repack entry
2022-01-13 15:27:22 +05:30
marination
c49dff385a
test: Check for FinishedGoodError if 0 FG in repack entry
2022-01-13 15:02:59 +05:30
marination
3922a39591
test: Basic test one item repacked into two
...
- Also run fg validation and fg marking after checking purpose, avoid unnecessary calls
2022-01-13 14:36:21 +05:30
Rucha Mahabal
3a18e62a9b
fix: filter for leave period in Bulk Leave Policy Assignment ( #29272 )
...
* fix: filter for leave period in Bulk Leave Policy Assignment
* fix: set title for Leave Policy Assignment
2022-01-13 14:08:11 +05:30
marination
eac7b5d5aa
fix: Allow multiple fg in repack entry
2022-01-13 13:44:20 +05:30
Rohit Waghchaure
dabe5981bb
fix: accounts are coming from different company in the dropdown
2022-01-13 12:51:34 +05:30
Saqib Ansari
0e1b8322c1
fix: threshold fields shows incorrect currency
2022-01-13 12:06:03 +05:30
mergify[bot]
82b2d22627
fix(Payroll): Cannot submit salary slips from amended payroll entry. (backport #29228 ) ( #29268 )
...
* fix: salary slip transaction state after payroll entry cancel
* fix: use db_set in on_cancel method
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 81f1b7dfeb68c5a70f4aa9bc0e24f7aedcd79669)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2022-01-13 11:09:36 +05:30
Ankush Menat
c80d5f70bc
Merge branch 'develop' into maint_sch_link_fix
2022-01-12 19:46:52 +05:30
Ankush Menat
eb8d08b411
fix: remove all stock UOM conversion when changing stock UOM
2022-01-12 19:41:28 +05:30
Rucha Mahabal
5cda4ea39f
fix: autoname generated for Job Applicant is too long ( #29260 )
...
* fix: autoname generated for Job Applicant is too long
- autoname based on email and append number if exists instead of concatenating name, email, title
- add more search fields for context during selection
* test: Job applicant naming and fix related tests
2022-01-12 19:03:36 +05:30
Mohammed Yusuf Shaikh
8b5827ed6d
fix: from time and to time not updated in drag and drop action #29114
...
fix: from time and to time not updated in drag and drop action
2022-01-12 18:49:33 +05:30
Marica
efcfb825d7
Merge pull request #29257 from marination/fix-reset-wh-defaults
...
fix: Avoid resetting Default wh fields for Manufacture Entry
2022-01-12 16:44:33 +05:30
Saqib Ansari
11fae15bec
fix(asset): check if fixed asset account is set against company ( #29189 )
2022-01-12 13:23:18 +05:30
rohitwaghchaure
71466c6456
Merge pull request #29179 from rohitwaghchaure/fixed-incorrect-scrap-qty-in-manufacture
...
fix: incorrect scrap item qty
2022-01-12 13:13:30 +05:30
Saqib Ansari
aef432ee2f
fix: description not fetched in sales order analytics report ( #29230 )
2022-01-12 13:11:21 +05:30
Rohit Waghchaure
8f0b2fa90e
fix: incorrect scrap item qty
2022-01-12 11:30:20 +05:30
Ankush Menat
8f0d10a1b7
chore: add crm module in issue template
...
[skip ci]
2022-01-11 18:45:53 +05:30
Ankush Menat
f8119563ca
fix(patch): enable all uoms on recently created sites
2022-01-11 17:49:30 +05:30
Ankush Menat
33aad4b950
fix: UOM autocomplete broken
...
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.
2022-01-11 17:49:30 +05:30
Deepesh Garg
d6ee678ec9
Merge pull request #29193 from ruthra-kumar/bug_deferred_report
...
fix: deferred report division by zero exception
2022-01-11 17:19:08 +05:30
Saqib Ansari
c45042c00e
feat: early payment discount on sales & purchase orders ( #29101 )
2022-01-11 15:03:07 +05:30
Rucha Mahabal
2b33e63d2c
fix: use get_all instead of get_list while fetching SLA doctypes ( #29216 )
...
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-11 14:40:08 +05:30
Ankush Menat
754596dfc1
fix: "update cost" should ignore overridden routing times #29154
...
fix: "update cost" should ignore overridden routing times
2022-01-11 14:20:44 +05:30
Saqib Ansari
75c8b2556e
fix(pos): cannot ignore pricing rule for one particular invoice ( #29222 )
2022-01-11 13:25:42 +05:30
Saqib Ansari
c62083653b
fix(gl-report): group by cost center only if include_dimensions is checked ( #28883 )
2022-01-11 12:45:40 +05:30
Deepesh Garg
962dd5eaec
Merge pull request #27318 from rtdany10/currency-exchange-settings
...
feat: currency exchange settings
2022-01-11 11:34:23 +05:30
Deepesh Garg
93d784dde3
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 21:28:53 +05:30
Deepesh Garg
ca5ea5f55f
fix: test cases
2022-01-10 21:28:29 +05:30
Marica
9d36e30ef7
Merge pull request #29131 from ankush/serial_no_patch
...
fix(patch): serial no whitespace trimming
2022-01-10 19:51:26 +05:30
Ankush Menat
f195f803ff
test: account reports
2022-01-10 19:14:22 +05:30
Ankush Menat
2d76c05175
refactor: unnecessary joining of lists
2022-01-10 19:14:22 +05:30
Ankush Menat
fab7a58056
chore: remove misleading comment
2022-01-10 18:28:46 +05:30
Ankush Menat
2854f63caf
fix!: drop python 3.7 support
2022-01-10 18:28:46 +05:30
Saqib Ansari
e5b649b588
fix: pos invoices consolidation case with permlevel ( #29011 )
2022-01-10 18:24:08 +05:30
Deepesh Garg
3fdd47e71f
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 17:32:15 +05:30
Deepesh Garg
e2dab6f421
fix: Cleanup and fixes
2022-01-10 17:31:38 +05:30
Ankush Menat
cbaa8fdade
refactor: convert query to ORM
2022-01-10 16:13:52 +05:30
Ankush Menat
0faa116f97
fix(patch): serial no whitespace trimming
...
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.
2022-01-10 16:02:27 +05:30
ruthra
8026f86548
refactor: get project from basic transactions
...
- sales order, sales invoice, purchase order and purchase order
- if project not found in transaction, get from items
2022-01-10 12:58:58 +05:30
Deepesh Garg
7d85755595
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report
2022-01-10 12:50:34 +05:30
Conn Campbell
31123436fb
fix: Task Depends on not removed from Gantt chart ( #28309 )
...
Co-authored-by: conncampbell <conncampbell@conzu.ca>
2022-01-10 10:28:10 +05:30
Ankush Menat
5b67dbf8d0
ci: only run label action once
2022-01-09 20:27:18 +05:30
Ankush Menat
55d00a3cf6
ci: fix auto label behaviour
2022-01-09 20:18:42 +05:30
