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
ruthra kumar
0331e37982
fix: incorrect billed_qty when item has multiple Delivery note
...
sales order analysis report returns incorrect billed_qty value for
an SO item has multiple delivery notes
2022-05-31 17:15:31 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Ankush Menat
691b34a8ed
chore: unnessary args
2022-05-31 14:15:13 +05:30
Ankush Menat
ddb46c5711
fix: batch selector flag ( #31191 )
...
This is broken again after serializing scan actions, which causes
selector to trigger before batch_no is set.
Solution: for duration of scan disable the selector
2022-05-31 14:14:27 +05:30
maharshivpatel
a8f98f3f96
feat(india): Improve E-way Bill Cancellation. ( #31088 )
2022-05-31 12:14:39 +05:30
Rucha Mahabal
ed1ba677d6
test: HRA Exemption in Proof Submission
2022-05-31 11:54:43 +05:30
Rucha Mahabal
cfe2f8cac1
fix: amount precision for Tax Exemption Proof Submission
2022-05-31 11:54:43 +05:30
Rucha Mahabal
2e98e9e0b9
test: set country to India before running regional tests
2022-05-31 11:54:43 +05:30
Rucha Mahabal
00adda7c8d
fix: Tax Declaration tests and amount precision
2022-05-31 11:54:43 +05:30
Rucha Mahabal
5e96a46c87
test: HRA Exemption in Employee Tax Exemption Declaration
2022-05-31 11:54:43 +05:30
Rucha Mahabal
2b65c9616f
fix: component pay calculation
2022-05-31 11:54:43 +05:30
Rucha Mahabal
34925a3a8c
fix: HRA Exemption calculation in case of multiple salary structure assignments
2022-05-31 11:54:43 +05:30
Deepesh Garg
f07246af82
Merge pull request #31127 from deepeshgarg007/loan_interest_accrual
...
feat: Auto accrue loan interest for backdated term loans
2022-05-31 09:55:26 +05:30
Deepesh Garg
25290bb5d5
Merge pull request #31184 from Mitchy25/patch-1
...
fix(accounts): Ignore Cancelled GL Entries
2022-05-31 09:48:44 +05:30
Mitchy25
a0c412a0dd
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.
2022-05-31 15:25:09 +12:00
Rucha Mahabal
78c39e947b
test: Salary Slip operations queuing, failure, and payroll entry status
...
- fix multicurrency test, remove redundant doc creation
2022-05-30 16:07:19 +05:30
Rucha Mahabal
42f6bca935
fix: reset Error Message on successful operation and fix status update on submit/cancel
2022-05-30 16:04:07 +05:30
Saqib Ansari
08bf0baaae
chore!: remove unused bill no & date from purchase receipt ( #31163 )
2022-05-30 14:50:50 +05:30
rohitwaghchaure
2cbc665d19
Merge pull request #31175 from ankush/recursive_non_explosive_bom
...
fix: allow recursive BOMs as long as they don't recursively explode
2022-05-30 13:27:16 +05:30
Rucha Mahabal
de55157997
chore: rename method get_salary_component_account method to set
...
- since it doesn't return any value
2022-05-30 12:47:26 +05:30
Ankush Menat
d7a7c47650
Merge branch 'develop' into recursive_non_explosive_bom
2022-05-30 11:12:57 +05:30
Ankush Menat
c02598a51b
chore: remove framework tests from erpnext
...
Similar tests exist in FW and this is failing because someone updated
the translations
2022-05-30 11:12:17 +05:30
Ankush Menat
954dac88a8
fix: allow non-explosive recrusive BOMs
...
Recursion should be allowed as long as child item is not "exploded"
further by a BOM.
2022-05-30 10:40:13 +05:30
Ankush Menat
d224bf1d34
fix: only erase BOM when do_not_explode is set
2022-05-30 10:40:13 +05:30
Ankush Menat
b170cec2fe
fix(ux): "New Version" button BOM
...
"duplicate" technically creates a new version but that's not intuitive
at all.
2022-05-30 10:40:12 +05:30
Devin Slauenwhite
85b48fcdb9
fix: barcode scan resolve after model is updated ( #31058 )
...
* fix: resolve row after model is updated.
* fix: wait for all fields in the model to be updated.
* fix: sider
* pref: clear scanned code after capturing value
* fix: use frappe.run_serially
2022-05-29 22:19:09 +05:30
Ankush Menat
933434c3ea
chore: format
2022-05-29 22:09:32 +05:30
HENRY Florian
ce8e05146e
chore: update translation fr for BOM ( #31126 )
...
* fix: update translation
* fix: fr translation for BOM
2022-05-27 17:27:43 +05:30
MOHAMMED NIYAS
7ff8acac51
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>
2022-05-27 17:13:14 +05:30
Rucha Mahabal
4df76f3956
Merge pull request #31160 from ruchamahabal/fix-gratuity-status-update
2022-05-27 15:05:31 +05:30
Rucha Mahabal
c9e070393d
test: make holiday list before running gratuity tests
2022-05-27 14:42:11 +05:30
Rucha Mahabal
79b0aede00
fix: add list view settings for Gratuity
2022-05-27 13:57:09 +05:30
Rucha Mahabal
6c66bbbbfe
refactor: clean-up gratuity tests
2022-05-27 13:39:25 +05:30
Rucha Mahabal
b81d7519c1
test: Gratuity status for payment via salary slip
2022-05-27 12:58:10 +05:30
Rucha Mahabal
385e22a067
fix: Gratuity status not updated on salary slip submission
2022-05-27 12:57:07 +05:30
Deepesh Garg
7adcac4e66
Merge pull request #31155 from deepeshgarg007/exchnage_rate_reset
...
fix: Exchange rate reste to 1 on making mapped doc
2022-05-27 12:17:17 +05:30
HarryPaulo
4b04694c2c
fix(pos): freeze screen while processing pos invoices ( #30850 )
2022-05-27 12:16:07 +05:30
Deepesh Garg
2a10f09d8d
fix: Exchange rate reste to 1 on making mapped doc
2022-05-27 12:12:34 +05:30
maharshivpatel
935e5b1dcd
fix(india): duplicate qrcode and hide button ( #31100 )
2022-05-27 11:48:55 +05:30
Ankush Menat
e3c0d0134e
Merge pull request #31101 from alyf-de/fix-warehouse-js
...
fix: Improve button labels in Warehouse
2022-05-26 18:14:49 +05:30
