Commit Graph

36302 Commits

Author SHA1 Message Date
Anuja Pawar
c7c921495b
fix: payment reference on adding cost center in PE and Issue Summary Report error fixes () 2021-03-22 11:21:15 +05:30
Rucha Mahabal
dffa647071
fix: membership renewal validation () () 2021-03-20 22:24:55 +05:30
Rucha Mahabal
5e1cb5e4bc
fix: membership renewal validation () 2021-03-20 22:22:01 +05:30
Sagar Vora
a85959f574
fix: remove unwanted parameter in calculate_rate_and_amount ()
* fix: remove unwanted parameter in calculate_rate_and_amount

* fix: translation syntax
2021-03-20 16:37:33 +05:30
Walstan Baptista
22054044a3
test: created a new user to test warehouse user perms ()
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-20 16:35:14 +05:30
Jannat Patel
08855182a3
test: fix test_loan for payroll module ()
* test: fix test_loan for payroll module

* fix: minor style changes
2021-03-19 16:34:14 +05:30
rohitwaghchaure
98a40d81d5
Merge pull request from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre
fix: revert stock balance value calculation
2021-03-19 16:22:51 +05:30
rohitwaghchaure
081499c0c0
Merge pull request from rohitwaghchaure/revert-stock-balance-value-calculation-develop
fix: revert stock balance value calculation
2021-03-19 16:22:13 +05:30
Rohit Waghchaure
67d94ac0cc fix: revert stock balance value calculation 2021-03-19 16:21:30 +05:30
Rohit Waghchaure
f21a55c8ef fix: revert stock balance value calculation 2021-03-19 16:19:34 +05:30
Deepesh Garg
23af1ed372
Merge pull request from deepeshgarg007/multi_currency_lcv_issues_v13
fix: Allow user to update exchange rate in Multi-currency LCV
2021-03-18 21:21:57 +05:30
Deepesh Garg
b75cbeee4d fix: Allow user to update exchange rate in Multi-currency LCV 2021-03-18 21:20:44 +05:30
Deepesh Garg
9b0a9cc2c0
Merge pull request from deepeshgarg007/multi_currency_lcv_issues
fix: Allow user to update exchange rate in Multi-currency LCV
2021-03-18 21:20:06 +05:30
Deepesh Garg
adcf9a42bd
Merge pull request from deepeshgarg007/nil_exempt_gstr_3b
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
2021-03-18 21:02:51 +05:30
Deepesh Garg
a5de22cb8e
Merge pull request from deepeshgarg007/nil_exempt_gstr_3b_v13
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
2021-03-18 21:02:41 +05:30
Walstan Baptista
6df61d217f
test: created a new user to test child perms ()
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-18 19:23:59 +05:30
Sagar Vora
6ac11a04b0
test: added warehouse for TCS Item as it is a Stock Item () 2021-03-18 18:07:21 +05:30
Sagar Vora
8ee1146f72
test: add stock to avoid NegativeStockError () 2021-03-18 17:45:25 +05:30
Mohammad Hasnain Mohsin Rajan
192ab05869
ci: use ubuntu 18 specifically () 2021-03-18 17:12:12 +05:30
Afshan
a04091aaf7
fix: exclude current doc while validation. () 2021-03-18 16:40:43 +05:30
Sagar Vora
b134b89fb0
test: fix NegativeStockError () 2021-03-18 16:36:40 +05:30
pateljannat
a2068d9b98 feat: profitability report 2021-03-18 15:25:22 +05:30
Sagar Vora
78e576ee6a
fix: default total_estimated_cost to zero ()
Co-authored-by: walstanb <walstanb@gmail.com>
2021-03-18 15:23:52 +05:30
Ankush Menat
c0a9c391eb
fix: hide alt tag if item is not shown in website 2021-03-18 14:07:24 +05:30
Deepesh Garg
d39055785a
Merge pull request from Anuja-pawar/fix_report_issue_summary
fix: Report Issue Summary fix for zero issues
2021-03-18 12:24:43 +05:30
Anuja Pawar
9bf1083d9e
fix: payment references from disappearing on selecting cost center ()
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-03-18 11:22:24 +05:30
Rushabh Mehta
14c3c5172d fix(minor): rearrange the cards on home workspace 2021-03-18 10:45:38 +05:30
Anuja P
2c8a38d9fa fix: report issue summary fix for zero issues 2021-03-18 10:36:46 +05:30
Sagar Vora
500f54e515
test: fix shift type not found () 2021-03-17 23:25:04 +05:30
Sagar Vora
52bbd4e182
test: clear Leave Period before running Leave Allocation tests () 2021-03-17 22:37:59 +05:30
Mohammad Hasnain Mohsin Rajan
7f906f9aaa
chore: add sider config ()
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-17 20:06:35 +05:30
Sagar Vora
c647b6088a
ci: update badge in README and add push event trigger () 2021-03-17 20:04:59 +05:30
Sagar Vora
19bb8c1137
ci: get branch name from GITHUB_REF if GITHUB_BASE_REF not available () 2021-03-17 20:03:54 +05:30
Sagar Vora
7645315424
test: set correct qty when creating subcontract transfer entry () 2021-03-17 20:01:21 +05:30
Sagar Vora
95e9b2fd6e
refactor(payroll): simplified logic for additional salary () 2021-03-17 19:58:56 +05:30
Sagar Vora
f4a6c7823a
test: create new item instead of using _Test Item to prevent error () 2021-03-17 19:57:53 +05:30
Sagar Vora
cf3fc99b12
test: fix salary component not found; other optimisation () 2021-03-17 19:54:08 +05:30
Rucha Mahabal
bacfaa4396
fix: calculate 80g certificate amount on validate for memberships () () 2021-03-17 19:51:59 +05:30
Rucha Mahabal
cbd67e662f
fix: calculate 80g certificate amount on validate for memberships () 2021-03-17 19:49:27 +05:30
Anurag Mishra
abf974daee fix: precision and formated document 2021-03-17 18:55:04 +05:30
Rohit Waghchaure
77add49c6a fix: don't club same free item 2021-03-17 18:49:54 +05:30
Deepesh Garg
438d9cad90 fix: Remove print statement 2021-03-17 18:04:05 +05:30
Deepesh Garg
f9519c7e13 fix: Group nil exempted and non gst items separately 2021-03-17 18:03:58 +05:30
Deepesh Garg
f9f0e347ed fix: Remove print statement 2021-03-17 18:03:17 +05:30
Deepesh Garg
084ec9773e fix: Group nil exempted and non gst items separately 2021-03-17 18:00:08 +05:30
Anurag Mishra
23b6294f5c
Merge pull request from resilient-tech/allow-duplicate-additional
fix(payroll): allow duplicate additional salaries
2021-03-17 17:39:52 +05:30
Deepesh Garg
a5987782bd fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report 2021-03-17 15:49:44 +05:30
Deepesh Garg
56c20fb79f fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report 2021-03-17 15:47:03 +05:30
Rohit Waghchaure
a9b1347600 fix: nonetype object has no attribute options 2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a feat: recursive product discount 2021-03-17 14:30:34 +05:30