Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount ( #25188 )
...
* fix: Round off final tax amount instead of current tax amount
* fix: Syntax error
* fix: Indentation
* fix: Round Off taxes order execution
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-14 11:20:27 +05:30
Deepesh Garg
b717420842
fix: Role to override maintain same rate check in transactions ( #25193 )
...
* feat: configurable action if the same purchase/selling rate is not maintained
* fix: Role to override maintain same rate check in transactions
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-14 10:43:45 +05:30
Deepesh Garg
ca412d37c8
Merge pull request #25290 from deepeshgarg007/gstr_1_taxable_value_update
...
fix: Taxable value including Freight and Forwarding charges in GSTR-1 Report
2021-04-13 17:49:56 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Deepesh Garg
2fe3056fa2
Merge pull request #24993 from frappe/ishanloya-regional
...
Correct state code for 'Other Territory'
2021-04-13 15:37:29 +05:30
Deepesh Garg
9aad73b9f0
Merge pull request #25195 from ankush/use_isinstance_instead_of_type
...
fix: broken type check in stock ageing report
2021-04-13 15:24:53 +05:30
Deepesh Garg
0dcb48a6ee
Merge pull request #25167 from ankush/escape_sql_credit_report
...
fix: escape sql filters in credit report
2021-04-13 15:24:15 +05:30
Deepesh Garg
3db8ba2d4a
Merge pull request #25033 from anupamvs/se-add-to-transit
...
fix: unable to submit stock entry
2021-04-13 14:59:54 +05:30
Deepesh Garg
c05f4ee1aa
Merge pull request #25082 from AfshanKhan/add-blank-for-status-issue-reports
...
fix: added blank option for status in report related to issue
2021-04-13 14:59:01 +05:30
Deepesh Garg
bb92929048
Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing
...
feat(italy): add document type field for e-invoicing
2021-04-13 13:48:21 +05:30
Suraj Shetty
36083ff36c
Merge pull request #25310 from rmehta/grid-field-fix
2021-04-13 12:40:27 +05:30
Suraj Shetty
82d0a1a13e
style: Add missing semicolons
...
- & make formatting consistent
2021-04-13 12:35:42 +05:30
Rushabh Mehta
ff935b4586
fix(minor): fix dynamically changing grid properties
2021-04-13 12:09:36 +05:30
Rushabh Mehta
3c58fd4d5e
fix(minor): fix dynamically changing grid properties
2021-04-13 12:05:10 +05:30
Rushabh Mehta
65f25c27b3
fix(minor): fix dynamically changing grid properties
2021-04-13 11:58:16 +05:30
Abdullah Abouzekry
20140425c8
fix: sales order not saving due type mismatch in promo scheme ( #24748 ) ( #25222 )
2021-04-13 11:36:39 +05:30
Deepesh Garg
1f49335335
Merge branch 'develop' into gstr_1_taxable_value_update
2021-04-13 10:29:52 +05:30
Ankush Menat
c65751d97f
test: ignore floating point errors in test_bom
2021-04-12 19:45:34 +05:30
Saqib
a19c98255f
fix: patch condition ( #25301 )
2021-04-12 19:02:28 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation ( #24969 )
2021-04-12 17:55:46 +05:30
Rohit Waghchaure
2339de7333
fix: update scheduler check tim
2021-04-12 16:09:55 +05:30
Deepesh Garg
719e0c1e60
fix: Taxxable value including Freight and Forwarding charges in GSTR-1 Report
2021-04-12 14:37:43 +05:30
Ankush Menat
53ce877ad9
Merge branch 'develop' into escape_sql_credit_report
2021-04-12 14:37:31 +05:30
Saqib
49336b8065
fix: consolidated sales invoice posting date ( #25119 )
2021-04-12 12:17:50 +05:30
prssanna
42f4a00c88
fix: declare data before assigining
2021-04-12 12:01:20 +05:30
Marica
be26e59087
Merge pull request #25196 from noahjacob/UX
...
fix: Company field in Warehouse
2021-04-12 11:08:45 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice ( #25029 )
...
* fix: Item wise tax rate for consolidated POS invoice
* fix: Do not alter item wise taxes for consolidated invoices
* fix: Add test case
* fix: Update
* fix: Set opening stock for test item
* fix: Add valuation rate for opening stock
2021-04-12 10:56:47 +05:30
Deepesh Garg
c36e48a869
fix: GST on freight charge in e-invoicing ( #25000 )
...
* fix: GST on freight charge in e-invocing
* fix: Add patch for taxable value field
* fix: Handle discounts on net total
* fix: Handle all types of discounts for e-invoicing
* fix: Absolute taxable values
* fix: Use correct tax amount
2021-04-12 10:55:43 +05:30
Marica
99522252c4
Merge branch 'develop' into UX
2021-04-12 10:51:24 +05:30
Anupam Kumar
9f73bd8040
fix: don't delete mode of payment account details while deleting company transactions ( #25217 )
2021-04-12 10:31:36 +05:30
Saqib
b8a270074e
fix(pos): cannot set qty to less than zero ( #25258 )
2021-04-12 10:28:05 +05:30
Anoop
207166fe8b
fix(patch): copy Lab Test / Template renamed field values ( #25276 )
...
reload_doc doctypes introduced since v11
2021-04-12 10:25:34 +05:30
Ankush Menat
d235fc75ad
fix: remove nonexistent method from pick list ( #25279 )
...
This method is merged in calculate_rate_and_amount() during repost item
valuation refactoring.
Ref:
e10f0a5a6c (diff-a160e3a8907dcdf28ce7728bb7dd45914ad8ab033489ea3de4c80fb1c4ca7fe9)
2021-04-12 10:23:06 +05:30
Deepesh Garg
4d4d7074d0
Merge pull request #25053 from deepeshgarg007/delivery_note_gst_category
...
fix: Add GST category field in Delivery Note
2021-04-10 22:12:42 +05:30
Deepesh Garg
1466e2d758
Merge pull request #25271 from deepeshgarg007/loan_penalty_new_fix
...
fix: Consider paid repayment entries in subsequent loan repayments
2021-04-10 21:00:46 +05:30
Deepesh Garg
81ecd0b8b6
Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category
2021-04-10 20:54:38 +05:30
Deepesh Garg
b58590251b
fix: minor improvements and tests
2021-04-10 19:55:36 +05:30
rohitwaghchaure
5899477cbb
Merge pull request #25015 from rohitwaghchaure/fixed-patch-item-reposting-for-incorrect-sl-and-gl-develop
...
fix: patch
2021-04-10 18:58:44 +05:30
Deepesh Garg
f38a653a08
fix: Show exact error message in datetime
2021-04-10 18:34:51 +05:30
Deepesh Garg
e7efbc1d33
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_penalty_new_fix
2021-04-10 18:33:38 +05:30
Deepesh Garg
37d6c19a34
fix: Consider paid repayment entries in subsequent loan repayments
2021-04-10 18:33:26 +05:30
Deepesh Garg
8a01dbe8e1
Merge pull request #25261 from ankush/issue_status_banner_fix
...
fix: condition for SLA status banner
2021-04-10 17:56:51 +05:30
Rohit Waghchaure
1db8c51749
fix: changed logic
2021-04-10 10:45:29 +05:30
Rohit Waghchaure
b9aa775f3b
fix: pricing_rule test cases
2021-04-10 10:45:28 +05:30
Rohit Waghchaure
1358443cdb
fix: patch
2021-04-10 10:42:08 +05:30
Deepesh Garg
c85c243f9c
Merge pull request #25255 from nextchamp-saqib/issue-condition-fix
...
fix: condition for setting agreement status
2021-04-09 21:40:14 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision
...
fix: Precision issues while allocating advance amount
2021-04-09 21:39:02 +05:30
noahjacob
110f28f869
Company field editable and is readonly after saving.
2021-04-09 20:01:47 +05:30
Saqib
14b98c1737
Merge branch 'develop' into issue-condition-fix
2021-04-09 18:29:01 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module ( #24583 )
...
* fix: Lead Source's module
* fix: patch fix
2021-04-09 18:15:51 +05:30