nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 16:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,057 Commits 458 Branches 1,746 Tags
abf353a286bc9e30b2f24dd0e07d2ad6bba855fc
Commit Graph

32057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
00a40c95ea Merge branch 'version-12-hotfix' into mr-se-warehouse-validation-hotfix 2021-01-06 09:33:56 +05:30
rohitwaghchaure
750da2f946 Merge pull request #24302 from rohitwaghchaure/allow-to-set-basic-rate-manually-for-manufacture-entry 
fix: 'Set Basic Rate Manually' field is now available for Manufacture type stock entry
 2021-01-05 17:01:27 +05:30
Rohit Waghchaure
ff524e676f fix: 'Set Basic Rate Manually' field is now available for Manufacure type stock entry 2021-01-05 15:09:54 +05:30
rohitwaghchaure
d8fc6ec471 Merge pull request #24301 from rohitwaghchaure/fixed-allow-to-override-basic-rate-for-fg 
fix: allow to override the basic rate for the finished good
 2021-01-05 14:55:42 +05:30
Rohit Waghchaure
4e12c70897 fix: allow to override the basic rate for the finished good 2021-01-05 14:54:52 +05:30
Saqib
7e97138beb fix(e-invoicing): minor calculation fixes (#24284) 2021-01-05 13:32:56 +05:30
Saqib
00865b9af3 fix(e-invoicing): minor calculation fixes (#24283) 2021-01-05 13:32:46 +05:30
Deepesh Garg
7d1a431d9c Merge pull request #23963 from vorasmit/remarks-fix-v12 
fix: add remarks to sales invoice
 2021-01-05 09:57:58 +05:30
Deepesh Garg
fe9e2ec008 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into remarks-fix-v12 2021-01-05 09:56:58 +05:30
Nabin Hait
ca4c12b44e Merge branch 'version-12-hotfix' into mr-se-warehouse-validation-hotfix 2021-01-05 09:30:09 +05:30
Nabin Hait
cdd950dee5 fix: Ignore customer and supplier while deleting company transactions (#24280) 2021-01-05 09:25:50 +05:30
rohitwaghchaure
21b17cf407 Merge pull request #24289 from rohitwaghchaure/fixed-source-warehouse-if-material-transfer-is-skip 
fix: incorrect source warehouse in stock entry
 2021-01-05 09:01:39 +05:30
rohitwaghchaure
6324cc238e Merge pull request #24288 from rohitwaghchaure/fixed-pricing-rule-not-working-in-offline-pos 
fix: pricing rule not working for offline POS
 2021-01-05 09:01:05 +05:30
marination
cdc0b8e435 fix: Dont validate warehouse values between MR to Stock Entry 
- Remove validation that checks if warehouse in Stock Entry is the same as MR that it was pulled from
 2021-01-04 18:59:48 +05:30
Prssanna Desai
7049cca855 Merge pull request #24290 from frappe/revert-24097-chart-imports 
Revert "fix: function imports in account_balance_timeline.py"
 2021-01-04 17:16:48 +05:30
Prssanna Desai
ba95d32876 Revert "fix: function imports in account_balance_timeline.py" 2021-01-04 17:14:50 +05:30
Rohit Waghchaure
bf1e0139e2 fix: incorrect source warehouse in stock entry 2021-01-04 16:23:14 +05:30
Rohit Waghchaure
bf490c3a27 fix: pricing rule not working for offline POS 2021-01-04 15:32:13 +05:30
Saqib
40b37f09fd fix: cannot save asset category withouut depr posting date 2021-01-04 11:48:45 +05:30
vorasmit
04e0b35154 Update patches.txt 2021-01-01 17:14:14 +05:30
vorasmit
82b4749166 Update patches.txt 2021-01-01 10:49:48 +05:30
vorasmit
ef06f3288f Delete update_sales_invoice_remarks.py 2021-01-01 10:48:44 +05:30
Saqib
945c0e86de fix: cannot submit e-invoice if legal name not found 2020-12-31 13:17:59 +05:30
Saqib
2cae3d7b38 fix: cannot submit e-invoice if legal name not found 2020-12-31 13:16:59 +05:30
Saurabh
03933f8461 Merge branch 'v12-pre-release' into version-12 v12.16.2 2020-12-31 11:20:28 +05:30
Saurabh
ba398bc779 bumped to version 12.16.2 2020-12-31 11:40:28 +05:50
Saqib
022a46fdcd fix: item value & invoice value calculations (#24241) 2020-12-31 11:17:27 +05:30
Deepesh Garg
d092b6c25a Merge pull request #24244 from deepeshgarg007/template_company_filter 
fix: Add company filter in tax template query
 2020-12-31 11:06:25 +05:30
Karthikeyan S
5add3ea210 fix(GST E Invoice): update live URLs for adaequare GSP (#24249) 2020-12-30 19:21:40 +05:30
Deepesh Garg
909346f222 fix: Add company filter in tax template query 2020-12-30 18:05:52 +05:30
Saurabh
d9a0e0c708 Merge branch 'v12-pre-release' into version-12 v12.16.1 2020-12-30 17:45:38 +05:30
Saurabh
839edaf613 bumped to version 12.16.1 2020-12-30 18:05:38 +05:50
Deepesh Garg
11f2da72b1 fix: Error on submitting sales invoice (#24243) 
* fix: Error on submitting sales invoice

* fix: remove return_taxes
 2020-12-30 17:44:23 +05:30
Saurabh
61298c3489 Merge branch 'v12-pre-release' into version-12 v12.16.0 2020-12-30 13:12:30 +05:30
Saurabh
2cf2697e74 bumped to version 12.16.0 2020-12-30 13:32:29 +05:50
rohitwaghchaure
1b0870a440 Merge pull request #24240 from saurabh6790/v12_16_change_log 
feat: change log for version 12.16.0
 2020-12-30 13:09:39 +05:30
Saurabh
5c107b99bd feat: change log for version 12.16.0 2020-12-30 13:07:05 +05:30
Saqib Ansari
edec82bb9e fix: unit rate & gross amount calculation 2020-12-30 11:57:16 +05:30
Saqib Ansari
45dbfaa7f9 fix: invoice value set to zero if rounded total disabled 2020-12-30 11:57:16 +05:30
Rohit Waghchaure
7d666ccfb4 fix: do not override the manually added valuation rate in stock entry 2020-12-30 11:57:16 +05:30
Saqib Ansari
246ef881a0 fix: e invoice request log permissions 2020-12-30 11:57:16 +05:30
Saqib Ansari
5f3635fbaf fix: travis 2020-12-30 11:57:16 +05:30
Rohit Waghchaure
ec59c6cebc fix: do not manufacture same serial no multiple times 2020-12-30 11:57:16 +05:30
Saqib Ansari
be58194678 fix: sider issues 2020-12-30 11:57:16 +05:30
Saqib Ansari
00306d8fd0 chore: code cleanup 2020-12-30 11:57:16 +05:30
Saqib Ansari
da83ec0f0d fix: cannot cancel irn without submitting sales invoice 2020-12-30 11:57:16 +05:30
Saqib Ansari
709d50ad21 fix: remove test pincode 2020-12-30 11:57:16 +05:30
Saqib Ansari
7f69820f04 fix: uncomment test condition 2020-12-30 11:57:16 +05:30
Saqib Ansari
a0c8106342 feat: multiple gstins for e invoicing 2020-12-30 11:57:16 +05:30
Saqib Ansari
8c8ab4140e fix: remove test supplier pincode 2020-12-30 11:57:16 +05:30