nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,845 Commits 459 Branches 1,746 Tags
4b9aed2c0e6da34a68de42df5fdd8a11cfaff11b
Commit Graph

34845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
4b9aed2c0e feat: add outstanding field in payment schedule 2021-04-27 12:54:39 +05:30
Saqib Ansari
7a3dbe1b72 feat: update discounted amount in payment terms 2021-04-27 12:54:04 +05:30
Saqib Ansari
cf23f83d6c feat: discount on early payment in payment terms 2021-04-27 12:54:00 +05:30
Deepesh Garg
f0816acfc2 Merge branch 'version-13-beta' of https://github.com/frappe/erpnext into enconnex_erpnext 2021-04-27 12:30:47 +05:30
Saqib Ansari
d73f1a8170 feat: set dynamic labels for payment schedule fields 2021-04-27 10:00:00 +05:30
Saqib Ansari
9faaa8ffd8 feat: base payment amount in payment schedule 2021-04-27 09:58:43 +05:30
Saqib Ansari
afb60c3678 fix: payment amount showing in foreign currency 2021-04-27 09:58:29 +05:30
Saqib Ansari
542c959257 feat: set dynamic labels for payment schedule fields 2021-04-26 19:21:47 +05:30
Saqib Ansari
70d5d2cb2b feat: base payment amount in payment schedule 2021-04-26 19:20:54 +05:30
Saqib Ansari
c55bbc2db9 fix: payment amount showing in foreign currency 2021-04-26 19:18:00 +05:30
Deepesh Garg
f9c13bf32b Merge pull request #25347 from nextchamp-saqib/einvoice-company-validation 
fix(e-invoicing): validation & tax calculation fixes
 2021-04-22 13:02:55 +05:30
Saqib Ansari
03107ffedd fix: shipping address 2021-04-21 12:31:22 +05:30
Afshan
68c0427aef chores: clean up 2021-04-20 13:13:26 +05:30
Afshan
e6d9d47cb4 feat: Dimension-wise Accounts Balance Report 2021-04-20 13:13:10 +05:30
Deepesh Garg
afbe93de3c Merge branch 'version-13-beta' of https://github.com/frappe/erpnext into enconnex_erpnext 2021-04-20 13:02:49 +05:30
Saqib Ansari
62895a4ca5 fix: test 2021-04-17 15:41:32 +05:30
Deepesh Garg
868b816c5a fix: Variable scope issue 2021-04-16 15:51:45 +05:30
Saqib Ansari
66773cabef fix: test 2021-04-15 16:44:55 +05:30
Saqib Ansari
a44db68b8e fix: remove extra condition 2021-04-15 13:40:31 +05:30
Saqib Ansari
6b198241e1 fix: validate total condition 2021-04-15 13:36:11 +05:30
Saqib Ansari
a9f3c3e50a feat: add company link to e-invoice settings 2021-04-15 13:32:31 +05:30
Saqib Ansari
ba563ca232 fix: test 2021-04-15 13:28:05 +05:30
Saqib Ansari
103ce8bbb7 fix: imports 2021-04-15 13:27:57 +05:30
Saqib Ansari
93c67ffd92 fix: sider 2021-04-15 13:26:26 +05:30
Saqib Ansari
491987b8d3 fix: except einvoice loading error seperately 2021-04-15 13:26:20 +05:30
Saqib Ansari
552330f744 fix: address validations & cancel eway bill dialog 2021-04-15 13:26:10 +05:30
Deepesh Garg
8e01c8aefb fix: GST on freight charge in e-invoicing 2021-04-15 13:22:39 +05:30
Saqib
ff57fbe2c1 fix(e-invoice): mandatory field pincode not found (#25200) 2021-04-05 14:33:01 +05:30
Saqib
fb0936be50 fix(india): critical e-invoicing fixes (#25164) 
* fix: place of supply & same object reference issue

* fix(regional): remove shipping address GSTIN validation for e-invoice

* fix: stopiteration error

Co-authored-by: bhavesh95863 <34086262+bhavesh95863@users.noreply.github.com>
 2021-04-05 11:00:37 +05:30
Deepesh Garg
ed369c105f fix: Role to override maintain same rate check in transactions 2021-04-04 21:31:11 +05:30
Rohit Waghchaure
192002e156 feat: purchase receipt creation from purchase invoice 2021-04-04 18:23:20 +05:30
Saurabh
7366b5d3eb Merge branch 'version-13-beta-pre-release' into version-13-beta v13.0.0-beta.14 2021-03-28 15:54:56 +05:30
Saurabh
ceb026c5ab bumped to version 13.0.0-beta.14 2021-03-28 16:14:56 +05:50
rohitwaghchaure
b38ea0cc8b fix: patch (#25014) 
* fix: patch

* fix: pricing_rule test cases
 2021-03-28 15:51:32 +05:30
rohitwaghchaure
f4901b4f22 Merge pull request #25034 from anupamvs/naming-pre-release 
fix: unable to submit stock entry
 2021-03-27 19:50:06 +05:30
Anupam
d429138dcc fix: added flag for dont_fetch_price_list_rate in transaction 2021-03-27 19:31:23 +05:30
rohitwaghchaure
6c7f029597 Merge pull request #25016 from hasnain2808/fix-ams-error-v13-pre-release 
fix: ams integration breaks when error raised
 2021-03-27 09:59:51 +05:30
Anupam
4adaf7ed2e Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release 2021-03-27 00:56:48 +05:30
Anupam
5d994d8aa1 fix: unable to submit stock entry 2021-03-27 00:54:19 +05:30
rohitwaghchaure
e825d2ab51 Merge pull request #25027 from rohitwaghchaure/feat-recursice-pricing-rule-pre 
Feat recursice pricing rule pre
 2021-03-26 19:09:39 +05:30
Rohit Waghchaure
256b9c7bf9 fix: total weight not set for free items 2021-03-26 19:05:46 +05:30
Rohit Waghchaure
0486276789 fix: don't club same free item 2021-03-26 19:05:45 +05:30
Rohit Waghchaure
fce552b811 fix: nonetype object has no attribute options 2021-03-26 19:05:45 +05:30
Rohit Waghchaure
cd8422a840 feat: recursive product discount 2021-03-26 19:05:43 +05:30
rohitwaghchaure
2c191c105f Merge pull request #25026 from ruchamahabal/production-raw-material-enhancements-v13 
feat(Production Plan): Enhancements in Material Request Plan Item
 2021-03-26 18:59:34 +05:30
Rucha Mahabal
44853da7c2 feat: Show Required Qty as per BOM in Material Request Items 2021-03-26 18:55:16 +05:30
Rucha Mahabal
4cd68cdecb feat: Add more fields to raw material download 2021-03-26 18:55:08 +05:30
Rucha Mahabal
d74ff72527 fix: Ordered and Reserved Qty for Production not getting fetched in Items 2021-03-26 18:55:00 +05:30
Rucha Mahabal
28a885a3a9 feat: show ordered and reserved qty in Material Request Plan Item table 2021-03-26 18:54:51 +05:30
Rucha Mahabal
efe2b425b1 feat(Production Plan): Consider Safety Stock in Required Qty Calculation 2021-03-26 18:54:34 +05:30