Commit Graph

34826 Commits

Author SHA1 Message Date
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
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
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
Saqib
f66aab6d98 fix: e-invoicing option visible even if settings disabled (#25021) 2021-03-26 16:40:51 +05:30
hasnain2808@gmail.com
e9c801e4bd fix: ams integration breaks when error raised 2021-03-26 14:32:02 +05:30
Nabin Hait
2a39b74ad2 fix: Fixes on job card and salary slip (#25011)
* fix: map conversion factor while making stock entry from job card

* fix: fetch additional salary in salary slip
2021-03-26 10:49:39 +05:30
Nabin Hait
d4499277b4 chore: Added change log 2021-03-25 12:18:22 +05:30
Nabin Hait
91026e026f chore: Added change log 2021-03-25 11:53:07 +05:30
rohitwaghchaure
d7d7df2fdd Merge pull request #24995 from rohitwaghchaure/incorrect-field-for-company
fix: incorrect fieldname
2021-03-24 16:45:41 +05:30
Rohit Waghchaure
244f3eeedc fix: incorrect fieldname 2021-03-24 16:42:22 +05:30
rohitwaghchaure
3c490088c4 Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre
fix: repost not completed backdated transactions
2021-03-24 12:38:42 +05:30
Rohit Waghchaure
9165327cf6 fix: repost not completed backdated transactions 2021-03-24 11:32:26 +05:30
Anupam Kumar
5c172044d7 fix: validate_series (#24987) 2021-03-23 21:13:06 +05:30
Deepesh Garg
d26ed25c3e fix: Period list for exponential smoothing forecasting report (#24983) 2021-03-23 21:11:06 +05:30
Jannat Patel
d7b139182b fix: serial no trim issue (#24981)
* fix: serial no trim issue

* fix: sider
2021-03-23 21:09:54 +05:30
Anupam
940c75f8ac fix: validate_series 2021-03-23 16:54:54 +05:30
Marica
5c7138c86b Merge pull request #24985 from ankush/allow_zero_valuation_SR_v13b_pr
fix: Allow zero valuation in stock reconciliation
2021-03-23 14:58:38 +05:30
Ankush Menat
2ba198576c fix: set valuation rate for customer items to zero
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
2021-03-23 14:03:09 +05:30
Ankush Menat
2a391298a7 test: customer item in stock reconciliation 2021-03-23 14:03:00 +05:30
Ankush Menat
6a534ea82b fix: Allow zero valuation in stock reconciliation
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.

Related issue: ISS-20-21-10248
2021-03-23 14:02:52 +05:30
Marica
4ccda9f799 chore: Allow changing Work Stations in WO. (#24898) 2021-03-23 10:45:57 +05:30
Deepesh Garg
d1f15b2a88 fix: TDS check getting checked after reload (#24973) 2021-03-23 10:45:06 +05:30