Marica
e34f3364d0
Merge branch 'develop' into email-digest
2021-01-13 12:03:03 +05:30
Anupam
5abb997a27
fix: resolved conflicts
2021-01-13 11:11:22 +05:30
rohitwaghchaure
1c362c81f2
Merge pull request #24324 from marination/bom-rm-rate-company-based
...
fix: Company Wise Valuation Rate for RM in BOM
2021-01-13 10:39:39 +05:30
rohitwaghchaure
bc465a3045
Merge pull request #24332 from rohitwaghchaure/fixed-payment-entry-multi-currency-issue-develop
...
fix: payment entry multi-currency issue
2021-01-13 00:13:14 +05:30
Marica
30cc040d50
Merge branch 'develop' into batch-selector
2021-01-12 20:14:35 +05:30
Marica
69f66664ce
Merge branch 'develop' into qi-reading-status
2021-01-12 19:32:47 +05:30
Anurag Mishra
36fa0512d2
fix: not able to create dunning from sales invoice
2021-01-12 17:02:19 +05:30
Deepesh Garg
59e2114419
Merge pull request #24311 from wojosc/patch-14
...
fix: Update item_tax_template_dashboard.py
2021-01-12 13:09:35 +05:30
Deepesh Garg
7fd2b35a7d
Merge pull request #24092 from pateljannat/project-template-and-tasks
...
feat: Project template with dependent tasks
2021-01-12 11:28:35 +05:30
Marica
69abc27316
Merge branch 'develop' into qi-reading-status
2021-01-12 11:15:36 +05:30
Anupam
c53ad88503
fix: resolved commit
2021-01-12 10:51:29 +05:30
Marica
0600d572ba
Merge branch 'develop' into batch-selector
2021-01-12 10:28:47 +05:30
Rucha Mahabal
80911577f5
Merge pull request #24340 from ruchamahabal/make-ipme-entries-editable
...
fix: allow medication entries to be deleted from the table
2021-01-11 17:59:02 +05:30
rohitwaghchaure
c92da35997
Merge pull request #22944 from anupamvs/opportunity-status
...
fix: Opportunity Status fix
2021-01-11 17:34:06 +05:30
Rucha Mahabal
8549358708
Merge branch 'develop' into make-ipme-entries-editable
2021-01-11 15:31:08 +05:30
Marica
aef71a8abe
Merge branch 'develop' into batch-selector
2021-01-11 14:22:11 +05:30
Marica
cffc489d57
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2021-01-11 13:39:49 +05:30
marination
7646d7b741
fix: Batch/Serial Selector for Batched Item
2021-01-11 12:51:15 +05:30
Jannat Patel
dcda8b9e8c
feat: Patient appointment status changes ( #24201 )
...
* feat: patient appointment status changes
* fix: sider
* fix: sider
* fix: test status on cancel of docs and test refactor
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-11 12:50:39 +05:30
Rucha Mahabal
aff3f611d3
fix: allow medication entries to be deleted from the table
2021-01-11 12:48:11 +05:30
Jannat Patel
8a07de9ee0
Merge branch 'develop' into project-template-and-tasks
2021-01-11 10:57:09 +05:30
pateljannat
2460e101a7
fix: indicator ofor template task
2021-01-11 10:05:54 +05:30
Marica
b9d5ae9285
Merge branch 'develop' into qi-ux
2021-01-08 20:28:28 +05:30
Marica
63a91fc742
Merge branch 'develop' into qi-ux
2021-01-08 18:42:54 +05:30
Marica
ace08b1e48
Merge branch 'develop' into qc-back-update-se
2021-01-08 18:42:19 +05:30
marination
b7637f49cd
fix: Remove QI link on cancel wherever same QI name exists
2021-01-08 18:35:49 +05:30
Anurag Mishra
05f6edfe0a
Merge branch 'develop' into fixed-payment-entry-multi-currency-issue-develop
2021-01-08 17:27:22 +05:30
Rohit Waghchaure
3777c6aa38
fix: payment entry multi-currency issue
2021-01-08 12:59:15 +05:30
Rucha Mahabal
a93151502c
fix: Components formulated from additional salary not being fetched in Payroll Entry
2021-01-08 12:10:26 +05:30
marination
c4963bfdb2
fix: Back Update from QC based on Batch No
2021-01-08 09:56:04 +05:30
marination
ff6ee9d4e7
fix: Formula field description and Rearrange grid view
...
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
2021-01-08 09:14:43 +05:30
Marica
5cfdd0f503
Merge branch 'develop' into qi-ux
2021-01-07 15:47:55 +05:30
marination
fab080c875
fix: Company Wise Valuation Rate for RM in BOM
2021-01-07 15:25:39 +05:30
pateljannat
fd5ebe9d4a
fix: patch and columns
2021-01-07 15:16:15 +05:30
Jannat Patel
a586b0ba17
Merge branch 'develop' into project-template-and-tasks
2021-01-07 13:01:02 +05:30
Anurag Mishra
77ba72c4ff
Merge branch 'develop' into payroll_fixes2.0
2021-01-06 14:23:53 +05:30
Anurag Mishra
e7fa6f6a1c
fix: edditable employee grid
2021-01-06 13:25:09 +05:30
Shivam Mishra
9fc44f1606
Merge pull request #24182 from scmmishra/fix-dont-set-primary
2021-01-06 12:52:44 +05:30
Jannat Patel
5a579089c2
fix: indentation
2021-01-06 11:21:13 +05:30
Deepesh Garg
5e15a5d230
Merge pull request #24186 from frappe/validate_regional_germany
...
fix: regional validation of sales invoice (germany)
2021-01-06 09:35:05 +05:30
Deepesh Garg
e72c51204b
Merge pull request #24189 from timgates42/bugfix_typo_update
...
docs: fix simple typo, udpate -> update
2021-01-06 09:34:11 +05:30
Deepesh Garg
f2863f9d16
Merge pull request #24313 from deepeshgarg007/ytd_error_fix_v13
...
fix: Consider only submitted salary slips
2021-01-06 09:30:00 +05:30
Deepesh Garg
ad8be7c1fe
fix: Consider only submitted salary slips
2021-01-06 09:29:03 +05:30
Rucha Mahabal
a7a609d4ff
Merge pull request #24281 from ruchamahabal/allow-discharge
...
feat: Allow Discharge despite Unbilled Healthcare Services
2021-01-06 09:27:26 +05:30
Deepesh Garg
6f18d4c0f6
Merge pull request #24312 from deepeshgarg007/sanctioned_loan_unpledge
...
fix: Sanctioned loan security unpledge
2021-01-06 09:13:19 +05:30
Deepesh Garg
05fe7ac29c
fix: fieldname
2021-01-06 09:10:28 +05:30
Deepesh Garg
dd768a07c5
fix: Sanctioned loan security unpledge
2021-01-05 23:55:00 +05:30
Wolfram Schmidt
5eef19723d
Update item_tax_template_dashboard.py
...
added missing backlink. In Item Groups I can set Item Tax Temple in Table taxes.
2021-01-05 18:47:11 +01:00
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month ( #24272 )
...
* fix: tax calculation on salary slip for the first month
* fix: net pay precision issue
* fix: net pay precision issue
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-01-05 20:43:11 +05:30
Deepesh Garg
b01b108dfa
fix: do not consider current salary slip in sum
2021-01-05 17:34:16 +05:30
