Deepesh Garg
b9dbb36d0e
chore: Linting Issues
2022-06-09 18:58:04 +05:30
Deepesh Garg
fe5b9e8bbb
Merge branch 'develop' into patch-4
2022-06-06 16:45:20 +05:30
Deepesh Garg
c57125a51a
Merge pull request #31242 from ankush/sales_register
...
fix(Sales Register): incorrect query with dimensions
2022-06-06 16:45:00 +05:30
Deepesh Garg
2041738e04
Merge pull request #31194 from ruthra-kumar/bug_sales_order_analysis_report
...
fix: incorrect billed_qty in sales order analysis report when multiple delivery notes for item
2022-06-06 16:39:13 +05:30
Ankush Menat
ee5bc58e9b
fix(job card): only hold during draft state ( #31243 )
2022-06-06 16:27:25 +05:30
Ankush Menat
c66c1e2215
chore(meta): disable stale bot on issues
2022-06-06 15:27:29 +05:30
Rucha Mahabal
edb775c381
test: Employee Benefit Application
...
- make `get_no_of_days` a function for reusability
2022-06-06 14:34:45 +05:30
Rucha Mahabal
3b8bc7d8e1
fix: incorrect LWP calculation for half days in employee benefit application
2022-06-06 14:34:45 +05:30
Rucha Mahabal
cf04683ad3
fix(Leave Application): 'Cancelled' status shown as 'Open' in list view
2022-06-06 14:34:45 +05:30
Rucha Mahabal
59de303b13
refactor: rewrite lwp queries using query builder
2022-06-06 14:34:45 +05:30
Rucha Mahabal
4decb7a02b
fix: Consider only Approved leave applications in LWP, Employee Benefit calculations
...
- do not allow submitting leave applications with 'Cancelled' status
2022-06-06 14:34:45 +05:30
Ankush Menat
c3219ebad1
fix(Sales Register): incorrect query with dimensions
...
If accounting dimension is also part of the default filters then same
query is repeated with incorrect syntax.
e.g. `item_group = (child1, child2)` instead of `in` query.
fix: don't add default filter if they are part of dimensions to be
added.
2022-06-06 12:39:12 +05:30
Deepesh Garg
a8c1b01437
Merge pull request #31230 from deepeshgarg007/item_wise_report_perf
...
fix: Remove redundant query
2022-06-06 12:23:56 +05:30
Deepesh Garg
c6d83c56d0
Merge branch 'develop' into item_wise_report_perf
2022-06-06 11:50:46 +05:30
Deepesh Garg
aad887bab9
Merge branch 'develop' into patch-4
2022-06-06 09:16:22 +05:30
Deepesh Garg
c21826e07d
Merge pull request #31223 from dj12djdjs/fix-validation-message
...
fix: display currencies in validation message.
2022-06-06 09:06:52 +05:30
Deepesh Garg
8b56f0559e
Merge branch 'develop' into item_wise_report_perf
2022-06-06 09:01:37 +05:30
Deepesh Garg
95a4602a23
Merge pull request #31231 from deepeshgarg007/gstr_3b_composite_supplies
...
fix(India): Supplies from composite dealer not showing up
2022-06-06 09:00:40 +05:30
Deepesh Garg
21de550549
Merge pull request #31219 from deepeshgarg007/group_filter_cost_center
...
fix: Parent dimension filters in orders
2022-06-06 08:58:40 +05:30
Deepesh Garg
9500aa8c94
Merge pull request #31218 from deepeshgarg007/distinct_gstin
...
fix(India): GSTIN filter in GSTR-1 report
2022-06-06 08:57:55 +05:30
Deepesh Garg
db07831db7
fix(India): Supplies from composite dealer not showing up
2022-06-05 12:13:02 +05:30
Deepesh Garg
a200e7e1fb
fix: Remove redundant query
2022-06-05 11:16:12 +05:30
Devin Slauenwhite
b061ea4cd2
chore: linter
2022-06-02 14:23:54 -04:00
Devin Slauenwhite
3a1c923e76
fix: display currencies in validation message.
2022-06-02 14:15:50 -04:00
Rucha Mahabal
12edddbfd4
Merge pull request #31074 from ruchamahabal/fix-salary-slip-bg-job
...
refactor(UX): Salary Slip creation and submission via background job in Payroll Entry
2022-06-02 18:41:46 +05:30
Rucha Mahabal
956a803be7
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-02 17:30:34 +05:30
Rucha Mahabal
1db4e623ab
fix: payroll operations button visibility
2022-06-02 17:26:08 +05:30
Rucha Mahabal
d641f26035
fix: error handling and messages
...
- remove savepoints since submission should stop if any error occurs
- refactor variable naming and msgprints
- test Salary Slip creation failure
- fix(test): explicitly commit after payroll entry creation so that the first salary slip creation failure does not rollback the Payroll Entry insert
2022-06-02 15:08:49 +05:30
Deepesh Garg
3f376cc3a5
fix: Parent dimension filters in orders
2022-06-02 13:57:54 +05:30
Deepesh Garg
f0ac394d6e
fix(India): GSTIN filter in GSTR-1 report
2022-06-02 12:59:55 +05:30
Ankush Menat
c7efa3b44d
ci: stale apt cache ( #31217 )
2022-06-02 12:27:11 +05:30
Ankush Menat
849a2dc349
Merge branch 'develop' into patch-4
2022-06-02 10:25:20 +05:30
Ankush Menat
77dcdff0db
fix: unusable SO after clearing taxes ( #31215 )
2022-06-01 22:01:07 +05:30
Sun Howwrongbum
48bde2de2a
fix: Trial Balance failing to ignore Finance Book
2022-06-01 20:20:16 +05:30
Rucha Mahabal
661e05e693
fix(tests): account and company setups
2022-06-01 17:28:42 +05:30
Ankush Menat
3974fbbb6e
feat: UOM specific barcodes ( #30988 )
2022-06-01 16:43:56 +05:30
Mohammad Hussain Nagaria
37433aad48
fix: Pluralize year text instead of optional bracket ( #31210 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-06-01 16:29:20 +05:30
Rucha Mahabal
536f1dfc4b
test: fix attendance tests for unmarked days ( #31205 )
...
* test: fix attendance tests for unmarked days
* chore: remove unused import
2022-06-01 13:56:55 +05:30
Ankush Menat
c84e11ac82
fix: re-validate warehouse after 'update items' ( #31203 )
2022-06-01 12:55:10 +05:30
Ankush Menat
03a24ce774
chore: delete dead cypress code
...
Moved to separate repo
2022-06-01 12:33:23 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch ( #31097 )
2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-01 12:15:42 +05:30
Rucha Mahabal
653d6341d4
refactor: clean-up and commonify payroll entry test setups
2022-06-01 12:14:42 +05:30
Deepesh Garg
82be717f10
Merge pull request #31201 from deepeshgarg007/manufacturing_workspace_fix
...
fix: Remove domain restriction from Manufacturing Workspace
2022-06-01 09:30:39 +05:30
Deepesh Garg
167cf7b49d
fix: Remove domain restrcition from Manufacturing Workspace
2022-06-01 09:04:53 +05:30
Deepesh Garg
753eb3ec3a
Merge branch 'develop' into bug_sales_order_analysis_report
2022-05-31 21:41:35 +05:30
Deepesh Garg
5fd31c6433
Merge pull request #31199 from deepeshgarg007/settings_perm_fix
...
fix: Permission for selling and buying settings
2022-05-31 21:40:55 +05:30
maharshivpatel
b3ccc4bfb9
fix: Auto Insert Item Price If Missing when discount & blank UOM ( #31168 )
...
* fix: Auto Insert Item Price If Missing when discount and blank UOM
fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom
* unit tests added for item with discount
I have added test for auto_insert_price where discount is used.
* unit test issue fixed
fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters.
Co-authored-by: Ankush Menat <me@ankush.dev>
2022-05-31 19:48:30 +05:30
Deepesh Garg
a6beafbc3c
fix: Permission for selling and buying settings
2022-05-31 19:41:46 +05:30
ruthra kumar
4f1bfbb93d
test: multiple delivery notes and billed quantity
2022-05-31 17:24:36 +05:30
