Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics
2020-09-14 11:21:58 -07:00
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry ( #23051 )
2020-09-14 21:12:36 +05:30
Saqib
6db92fbb6a
feat: validate workflow before so/po update items ( #23024 )
...
* feat: validate workflow before so/po update items
* fix: incorrect workflow validation on so/po update items
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-14 19:54:17 +05:30
Deepesh Garg
93d7c2f1da
Merge pull request #23283 from ruchamahabal/fix-student-email-id
...
fix: Set student email id mandatory only if skip user creation is disabled
2020-09-14 19:34:10 +05:30
Rucha Mahabal
1751929a55
Merge pull request #22853 from ruchamahabal/refactor-lab-module
...
refactor: Laboratory Module
2020-09-14 16:32:51 +05:30
Rucha Mahabal
026cf2d3cc
Merge branch 'develop' into refactor-lab-module
2020-09-14 14:45:19 +05:30
Marica
59d20c7d2c
Merge pull request #23315 from marination/pr-dn-get-items
...
fix: Make sure Supplier/Customer is selected before fetching Items(ux)
2020-09-14 11:35:02 +05:30
Marica
c4a8c9eb26
Merge branch 'develop' into pr-dn-get-items
2020-09-14 11:09:32 +05:30
rohitwaghchaure
7fc629b71a
Merge pull request #23316 from marination/quality-inspection-fields
...
fix: Make Reference fields mandatory in Quality Inspection (ux)
2020-09-13 18:12:05 +05:30
marination
9205101ecf
fix: Make Reference fields mandatory in Quality Inspection
2020-09-12 16:17:13 +05:30
marination
0a688005be
fix: Make sure Supplier/Customer is selected before fetching Items.
2020-09-12 15:39:27 +05:30
Anupam K
ed08e593c3
feat: added project in Sales Analytics report
2020-09-11 14:03:31 +05:30
Saqib
cd89994b33
fix: multiple pos issues ( #23297 )
...
* fix: returns can be made against unconsolidated invoices
* fix: indentation
* fix: mode of payment not fetching for pos returns
* patch: default pos profile print format
* fix: tests
* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
Rucha Mahabal
a29436dc91
fix: codacy
2020-09-10 17:45:17 +05:30
Rucha Mahabal
c0f9d1b65a
test: Lab Module
2020-09-10 17:33:52 +05:30
Rucha Mahabal
42bff3289d
Merge branch 'develop' into refactor-lab-module
2020-09-10 12:36:29 +05:30
Rucha Mahabal
2388199347
Merge branch 'develop' into fix-student-email-id
2020-09-10 12:16:16 +05:30
Rucha Mahabal
1915a60834
fix: education settings check
2020-09-10 12:13:58 +05:30
Saqib
ec6a97fb6a
fix: cannot delete pos page if linked with desk page ( #22993 )
...
* fix: cannot delete pos page if linked with desk page
* fix: replace pos page links with point-of-sale page
Co-authored-by: gavin <gavin18d@gmail.com>
2020-09-09 10:54:14 +05:30
Deepesh Garg
dc84633860
Merge pull request #23301 from deepeshgarg007/closed_loan_amount
...
fix: Amount for closed loans
2020-09-08 21:32:54 +05:30
Deepesh Garg
846e6d4803
fix: Add test
2020-09-08 21:32:06 +05:30
Deepesh Garg
f247686ace
fix: Amount for closed states
2020-09-08 21:26:06 +05:30
Saqib
8f43cf2c9a
fix: asset movement date for backdated asset entry ( #23298 )
2020-09-08 17:44:47 +05:30
rohitwaghchaure
93dccd2eaa
Merge pull request #23132 from anupamvs/item-group-filter-portal
...
fix: [Portal] added filter show in website
2020-09-08 17:03:54 +05:30
rohitwaghchaure
1d555f35a7
Merge pull request #23282 from deepeshgarg007/tds_bug
...
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-08 16:59:29 +05:30
Anupam Kumar
09e2cb5f87
Merge branch 'develop' into item-group-filter-portal
2020-09-08 14:54:31 +05:30
Marica
13483a3b3c
Merge pull request #23291 from AfshanKhan/reverse-je-ignore-flag
...
fix: removed ignore permission flag
2020-09-08 13:45:03 +05:30
Deepesh Garg
f7731b0715
fix: TDS applicable on creating PI from get items button
2020-09-08 13:41:04 +05:30
Afshan
12ab8ebc95
fix: removed ignore permission flag
2020-09-08 12:55:42 +05:30
Marica
693200255a
Merge pull request #23175 from AfshanKhan/handle-irs
...
fix: IRS 1099 report
2020-09-08 12:43:38 +05:30
Marica
c8eca9d5f3
Merge branch 'develop' into handle-irs
2020-09-08 12:03:45 +05:30
Rucha Mahabal
f7619df8b2
fix: Lock row in subquery while setting delivered qty ( #23100 )
2020-09-08 11:57:45 +05:30
Afshan
9691422fb7
feat: added report for mismatch in serial nos and stock quantity in warehouse ( #22669 )
...
* feat: added report for mismatch in serial nos and stock quantity in warehouse
* style: removed print statement
* fix: rename of reports and refactor of code
* fix: handled null condition for actual qty and added report link in stock desk page
* style: breaking code in multiple lines
2020-09-08 11:57:15 +05:30
rohitwaghchaure
31fd90136d
Merge pull request #23243 from Anurag810/overlap_for_additional_salary
...
feat: Overlap validation additional salary
2020-09-08 10:18:41 +05:30
rohitwaghchaure
7d7fa79efa
Update additional_salary.py
2020-09-08 10:18:18 +05:30
rohitwaghchaure
900d0e3ae2
Merge pull request #23245 from Anurag810/attendance_calendar_map
...
fix: Attendance calendar map fix
2020-09-08 10:14:37 +05:30
rohitwaghchaure
842cb6d1d6
Update shift_assignment.py
2020-09-08 10:14:04 +05:30
Anupam Kumar
7131024bf9
Merge branch 'develop' into item-group-filter-portal
2020-09-08 10:04:51 +05:30
rohitwaghchaure
0cb805308f
Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order
...
fix: capture advance payments in payment order
2020-09-08 09:59:47 +05:30
rohitwaghchaure
7296a75b1f
Merge pull request #23288 from barry86m/patch-4
...
fix: consolidated financial statement sums values into wrong parent
2020-09-08 09:56:18 +05:30
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent
...
fix proposed by Andriesvn in bug report
closes #22180
2020-09-08 00:27:57 +01:00
Deepesh Garg
b828e2fcf4
Merge pull request #23287 from deepeshgarg007/lsu_api_fix
...
fix: Only submitted Loan security pledges should be approved
2020-09-07 23:23:55 +05:30
Deepesh Garg
03b0ad4f98
fix: Only submitted Loan security pledges should be approved
2020-09-07 23:22:21 +05:30
Anupam Kumar
22bd03e63c
Merge branch 'develop' into item-group-filter-portal
2020-09-07 20:20:42 +05:30
Rucha Mahabal
4673bed67e
fix: codacy issues
2020-09-07 20:12:29 +05:30
Rucha Mahabal
06f89a1b94
fix: Set student email id mandatory only if skip user creation is disabled
2020-09-07 19:46:53 +05:30
Deepesh Garg
74ab1084b3
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-07 17:55:10 +05:30
Deepesh Garg
af1c4ba443
Merge pull request #23279 from deepeshgarg007/loan_closure_interest
...
fix: Pending loan interest accrual on loan closure
2020-09-07 15:01:33 +05:30
Deepesh Garg
afefa878b0
fix: Pending loan interest accrual on loan closure
2020-09-07 14:57:44 +05:30
Deepesh Garg
da6074a84c
fix: Pending loan interest accrual on loan closure
2020-09-07 14:55:04 +05:30
