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
Raffael Meyer
dc9ef51d97
Merge branch 'develop' into improve_taxes_setup
2021-04-10 15:09:41 +02:00
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
a5d062453e
feat: added test case
2021-04-10 10:49:31 +05:30
Rohit Waghchaure
cb6494876f
feat: purchase receipt creation from purchase invoice
2021-04-10 10:49:30 +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
Anupam Kumar
a91d7bd4b5
Merge branch 'develop' into se-add-to-transit
2021-04-09 18:00:03 +05:30
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning
2021-04-09 17:59:47 +05:30
Ankush Menat
5451bbf7d2
fix: condition for SLA status banner
...
If the document is NOT in the closed state and fulfilled then there
won't be any banner. This bug was introduced while fixing a bug related
to buttons, so separated out code for showing buttons and showing
banners.
2021-04-09 17:19:02 +05:30
rohitwaghchaure
526f76c27d
Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project
...
fix: travis
2021-04-09 17:07:22 +05:30
Rohit Waghchaure
ca5e10892c
fix: travis
2021-04-09 16:23:45 +05:30
Afshan
dc73a9995d
Merge branch 'develop' into add-blank-for-status-issue-reports
2021-04-09 13:04:34 +05:30
Marica
c6b3766fb2
Merge pull request #24921 from Anurag810/item-dashboard-fixes
...
fix: precision and formatted document for stock level in item dashboard.
2021-04-09 12:43:06 +05:30
Saqib Ansari
032246dc2b
feat(italy): add document type field for e-invoicing
2021-04-09 12:08:24 +05:30
Marica
d38618fc34
Merge branch 'develop' into item-dashboard-fixes
2021-04-09 11:57:56 +05:30
Marica
5467d7c3e3
fix: Use system precision instead of SLE precision
2021-04-09 11:56:49 +05:30
Marica
a7ac01153e
fix: Remove redundant import and import cint
2021-04-09 11:55:44 +05:30
Marica
ad75944960
Merge pull request #25105 from Anuja-pawar/fix_picked_qty_in_DN
...
fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List
2021-04-09 11:48:56 +05:30
Saqib Ansari
e7813b69c4
fix: condition for setting agreement status
2021-04-09 11:46:16 +05:30
Marica
b89a40aa3c
Merge branch 'develop' into fix_picked_qty_in_DN
2021-04-09 11:45:39 +05:30
Marica
7f0e92c9b9
Merge pull request #25232 from nextchamp-saqib/coa-importer-validate-fix
...
fix: keyerror while validating coa file
2021-04-09 11:44:40 +05:30
Deepesh Garg
63e6036d12
Merge pull request #25235 from ankush/remove_purch_inv_validation
...
fix: remove gst name validation for purchase Invoice
2021-04-09 10:48:34 +05:30
Saqib
4191e7999d
chore: add error title
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-08 21:04:56 +05:30
Deepesh Garg
edb4663258
Merge pull request #25251 from nextchamp-saqib/einv-ack-no-fix
...
fix(india): set correct ack no. on irn generation
2021-04-08 20:48:01 +05:30
Saqib Ansari
30720d2139
fix: set correct ack no. on irn generation
2021-04-08 19:06:44 +05:30
Rucha Mahabal
b7aa658a51
refactor(HR): Add missing reports and doctypes to the Workspace ( #24994 )
...
* refactor(HR): Add missing reports and doctypes to the Workspace
* refactor: remove Employee Tax and Benefits from HR Workspace
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-04-08 18:13:21 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue ( #25127 )
...
* fix: serial no refresh issue
* fix: sider
2021-04-08 16:04:57 +05:30
Anupam Kumar
9d830255c1
Merge branch 'develop' into se-add-to-transit
2021-04-08 14:44:08 +05:30
rohitwaghchaure
f9fde054e1
Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost
...
fix: bom cost test case
2021-04-08 14:39:08 +05:30
