Deepesh Garg
|
9e648183db
|
fix: Test case
|
2021-06-09 18:26:16 +05:30 |
|
Deepesh Garg
|
7dabb6be30
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
|
2021-06-09 18:10:55 +05:30 |
|
ChillarAnand
|
8eab59b062
|
chore: Upgrade PyGithub to 1.55
Frappe has upgraded to PyJWT>2. Upgrading PyGithub to resolve
dependency issues
|
2021-06-09 18:05:39 +05:30 |
|
Deepesh Garg
|
b57ebba3fd
|
fix: Validate negative allocated amount in Payment Entry (#25799)
|
2021-06-09 17:56:41 +05:30 |
|
Deepesh Garg
|
4c1dad8207
|
fix: Debug tests
|
2021-06-09 14:18:23 +05:30 |
|
Deepesh Garg
|
8090965162
|
fix: Debug test
|
2021-06-09 13:45:42 +05:30 |
|
Deepesh Garg
|
758db793be
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
|
2021-06-09 13:39:07 +05:30 |
|
Deepesh Garg
|
bf5f87c2fe
|
Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore
fix: Ignore internal transfer invoices from GST Reports
|
2021-06-09 13:32:52 +05:30 |
|
Deepesh Garg
|
be631d1caf
|
Merge pull request #25986 from nextchamp-saqib/einvoicing-service-item-check
fix(e-invoicing): service item check
|
2021-06-09 13:00:43 +05:30 |
|
Anupam Kumar
|
21b8e2f0d8
|
fix: hiding Rounding Adjustment field (#25380)
* fix: hiding Rounding Adjustment field
* fix: updating purchase_invoice.json
|
2021-06-09 12:57:21 +05:30 |
|
Deepesh Garg
|
9a282aa593
|
Merge pull request #25858 from alyf-de/item-tax-templates
feat: Item Tax Templates for Germany
|
2021-06-09 12:50:27 +05:30 |
|
Rohit Waghchaure
|
99b583f688
|
fix: on click of duplicate button system copy the difference account from first row
|
2021-06-09 00:06:35 +05:30 |
|
Saqib Ansari
|
18eed58fc5
|
fix(e-invoicing): service item check
|
2021-06-08 20:52:14 +05:30 |
|
Jannat Patel
|
6b8c123fd9
|
fix: Quiz timer (#25983)
* fix: quiz timer
* fix: pass time bound parameter
* fix: sider
|
2021-06-08 18:57:49 +05:30 |
|
Rucha Mahabal
|
5ed2ef493a
|
Merge pull request #25984 from pateljannat/quiz-fixes-v13
fix: Quiz fixes v13
|
2021-06-08 18:57:24 +05:30 |
|
pateljannat
|
7ace06ac21
|
fix: sider
|
2021-06-08 18:26:23 +05:30 |
|
Sagar Vora
|
10ec2eed6f
|
Merge pull request #25985 from resilient-tech/fix-quotation
fix: variable declaration
|
2021-06-08 18:09:34 +05:30 |
|
walstanb
|
646f0c3b53
|
fix: variable declaration
|
2021-06-08 17:54:34 +05:30 |
|
Ganga Manoj
|
0ea4d850e1
|
fix: Allow all System Managers to delete company transactions (#25834)
|
2021-06-08 17:23:44 +05:30 |
|
pateljannat
|
bbf07d9214
|
fix: quiz timer issues
|
2021-06-08 17:05:44 +05:30 |
|
Deepesh Garg
|
e4fcc5562f
|
refactor: Advance taxes and charges calculation
|
2021-06-08 16:35:47 +05:30 |
|
Sagar Vora
|
3f1231b77c
|
Merge pull request #25981 from resilient-tech/ssa-selection-v13
fix: choose correct Salary Structure Assignment when getting data for formula eval
|
2021-06-08 15:21:10 +05:30 |
|
Sagar Vora
|
062e247353
|
test: remove unused imports
|
2021-06-08 14:43:28 +05:30 |
|
Sagar Vora
|
ca205be5ac
|
fix: tests
|
2021-06-08 14:43:28 +05:30 |
|
Sagar Vora
|
0e5e1350b2
|
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
|
2021-06-08 14:43:28 +05:30 |
|
Sagar Vora
|
74818c7b62
|
fix: improve filter for from_date ; validation for joining and relieving date
|
2021-06-08 14:43:28 +05:30 |
|
Sagar Vora
|
447c978757
|
fix: choose correct Salary Structure Assignment when getting data for formula eval
|
2021-06-08 14:43:28 +05:30 |
|
Rucha Mahabal
|
f393934f3f
|
Merge pull request #25876 from resilient-tech/fix-ssa-selection
fix: choose correct Salary Structure Assignment when getting data for formula eval
|
2021-06-08 13:11:32 +05:30 |
|
Sagar Vora
|
5b1e7a61b8
|
test: remove unused imports
|
2021-06-07 19:34:02 +05:30 |
|
Sagar Vora
|
7f5378d98a
|
fix: tests
|
2021-06-07 18:40:54 +05:30 |
|
Anuja Pawar
|
d4398fd84a
|
fix: update cost center from pos (#25971)
|
2021-06-07 16:20:21 +05:30 |
|
rohitwaghchaure
|
cf7baeab16
|
Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue
fix: custom conversion factor field not mapped from job card to stock entry
|
2021-06-07 11:45:44 +05:30 |
|
Deepesh Garg
|
6f2dacc60c
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
|
2021-06-06 19:31:50 +05:30 |
|
Deepesh Garg
|
7a20c3b92a
|
fix: Ignore internal transfer inoices from GST Reports
|
2021-06-06 19:23:21 +05:30 |
|
Deepesh Garg
|
18be767f75
|
fix: Remove invalid test
|
2021-06-06 13:25:34 +05:30 |
|
Anupam
|
bf0528413d
|
fix: payroll entry employee detail issue
|
2021-06-06 13:12:13 +05:30 |
|
Saqib
|
d689068d82
|
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8
fix(pos): multiple pos issues
|
2021-06-06 11:25:29 +05:30 |
|
Saqib Ansari
|
3f32969bee
|
fix(pos): broken image in item details section
|
2021-06-06 11:18:20 +05:30 |
|
Saqib Ansari
|
bc46a9772d
|
fix(pos): cash shortcuts not working
|
2021-06-06 11:11:07 +05:30 |
|
Saqib Ansari
|
a85c2c16b4
|
fix(pos): item rate precision in item selector
|
2021-06-06 11:07:20 +05:30 |
|
Deepesh Garg
|
3646c301ed
|
fix: Linting issues
|
2021-06-05 13:21:03 +05:30 |
|
Deepesh Garg
|
e8a78bd43d
|
fix: Add test cases
|
2021-06-05 13:16:39 +05:30 |
|
Deepesh Garg
|
8a7e283926
|
feat: Item Taxes based on net rate
|
2021-06-04 22:53:26 +05:30 |
|
barredterra
|
572b6df0f2
|
Merge branch 'version-13-hotfix' into item-tax-templates
|
2021-06-04 16:55:11 +02:00 |
|
gavin
|
203a363cd6
|
Merge branch 'develop' into patch-tests
|
2021-06-04 20:13:15 +05:30 |
|
Gavin D'souza
|
102afe7de1
|
fix: Manually link_fields from flags before rename_doc
|
2021-06-04 20:11:34 +05:30 |
|
Gavin D'souza
|
ac99c719bc
|
Revert "fix(patch): Reload linked doctypes before renaming dt"
This reverts commit 4e2e8daca9
because although it fixed it locally, didn't seem to do anything for erpnext CI
|
2021-06-04 20:10:26 +05:30 |
|
Gavin D'souza
|
4e2e8daca9
|
fix(patch): Reload linked doctypes before renaming dt
|
2021-06-04 17:56:28 +05:30 |
|
Gavin D'souza
|
0b7da52ef1
|
fix(patch): Handle NULL values from fieldtype change
|
2021-06-04 17:07:45 +05:30 |
|
Sagar Vora
|
bd92b4339c
|
perf: use frappe.get_value with wildcard instead of another frappe.get_doc call
|
2021-06-04 16:09:00 +05:30 |
|