Deepesh Garg
4d87465698
Merge branch 'develop' into asset_split
2022-01-29 12:54:44 +05:30
Saqib Ansari
452a809ef4
Merge pull request #28877 from nextchamp-saqib/multiple-pricing-rule-fix
...
fix: qty filter not working if apply_multiple_pricing_rules is enabled
2022-01-29 12:43:41 +05:30
Saqib Ansari
4c8408a572
Merge branch 'develop' into fix-dn-mapping
2022-01-29 12:42:19 +05:30
Saqib Ansari
04a28df170
fix: remove invalid patch
2022-01-29 12:40:25 +05:30
Deepesh Garg
5090959dc1
Merge branch 'develop' of https://github.com/frappe/erpnext into asset_split
2022-01-29 12:12:52 +05:30
marination
2f4d266ee1
refactor: Price fetching and updation logic
...
- fetch price from price list, use item master valuation rate as fallback fo0r packed item
- use a item code, item row name map to maintain cumulative price
- reset table if item in a row is replaced
- loop over items table only to set price, lesser iterations than packed items table
2022-01-28 19:03:40 +05:30
Saqib Ansari
a1f3dc4e9e
chore: remove unnecessary imports
2022-01-28 16:58:13 +05:30
Deepesh Garg
e45c38337c
fix(India) Tax calculation for overseas suppliers
2022-01-28 16:10:30 +05:30
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing
2022-01-28 14:34:29 +05:30
Ankush Menat
28994c0e76
test: delete data after running test
2022-01-28 13:50:57 +05:30
marination
2c14ab0439
chore: Break updation logic into smaller functions
...
- Smaller functions for updation
- All calls visible from parent function to avoid context switching due to nested calls
2022-01-28 13:25:55 +05:30
Ankush Menat
e4c220053f
fix(patch): update BOMs to have correct transfer_material_against
2022-01-28 13:22:47 +05:30
Ankush Menat
86efa0dbfd
fix: ensure correct-ish transfer against
2022-01-28 13:22:47 +05:30
Ankush Menat
251576a6bb
chore: disable annoying flake8 formatting for QB ( #29488 )
...
[skip ci]
2022-01-28 13:17:43 +05:30
Saqib Ansari
02af32dde6
fix: incorrect patch path
2022-01-28 10:17:16 +05:30
Saqib
139d5e17a9
fix: do not get password if client_secret is not set ( #28547 )
2022-01-27 20:24:05 +05:30
Saqib
c98887d39d
fix(e-invoicing): totals validation of e-invoices ( #28418 )
2022-01-27 20:23:46 +05:30
mergify[bot]
0dafa8a12a
fix: stock ledger rendering glitch
...
undefined Issue
(cherry picked from commit f38004219518e901eb736780b181c19fe88ce823)
Co-authored-by: smehata <53169014+smehata@users.noreply.github.com>
2022-01-27 20:23:24 +05:30
Saqib
eb057b6bfe
fix(e-invoicing): link to error log list
2022-01-27 20:19:56 +05:30
Saqib
0b626816d0
feat(e-invoicing): dispatch address ( #28084 )
2022-01-27 20:19:37 +05:30
Saqib
b262f48553
fix: 'NoneType' has no attribute 'name' ( #27375 )
2022-01-27 20:19:22 +05:30
Saqib Ansari
1076e96b87
Revert "refactor!: remove e_invoice utils ( #27167 )"
...
This reverts commit 8ed6338336
2022-01-27 20:10:18 +05:30
Saqib Ansari
c5782b0e71
revert: "refactor!: drop e-invoicing integration from erpnext ( #26940 )"
...
This reverts commit c335962827
2022-01-27 20:09:56 +05:30
Ankush Menat
b05287dea0
fix: drop six code ( #29479 )
2022-01-27 20:08:05 +05:30
rohitwaghchaure
b75b00fefc
feat: provision to exclude exploded items in the BOM ( #29450 )
2022-01-27 12:44:01 +05:30
Suraj Shetty
0cb965f223
Merge pull request #29471 from frappe/fix-sorting
2022-01-27 11:15:57 +05:30
Suraj Shetty
29c7947db0
fix: Further sort sales_order_analysis to get consistent response
...
Since the data was sorted by `transaction_date`, report sorting order used to be inconsistent everytime if there were lots of records with same transaction date. This used to create problems while exporting report as "Excel" with filters.
2022-01-27 11:11:37 +05:30
ChillarAnand
16ca81d6a6
refactor: Remove non-profit code in ERPNext
2022-01-27 10:08:41 +05:30
Rucha Mahabal
6c1c85be0c
feat: additional doctypes access for ESS user ( #29317 )
2022-01-27 00:51:29 +05:30
Ankush Menat
7eab945d8c
refactor: move existing patches to post migration ( #28940 )
...
Also remove duplicates :')
2022-01-26 12:40:21 +05:30
marination
4c677eafe9
fix: Linter and minor code refactor
...
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)
2022-01-26 01:10:24 +05:30
Ankush Menat
f5f3552abb
test: cover more reports in test
2022-01-25 23:22:14 +05:30
marination
f8a5786542
chore: SQL to QB & accomodate Update Items
...
- `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty)
- converted more raw sql to qb and ORM
2022-01-25 19:51:47 +05:30
marination
3f48fc1898
fix: Incorrect packing list for recurring items & code cleanup
...
- Fix Incorrect packing list for recurring items in the Items table
- Re-organised functions based on external use and order of use
- Deleted `clean_packing_list` function and reduced no.of loops
- Raw SQL to QB
- Minor formatting changes
2022-01-25 18:38:41 +05:30
Saqib Ansari
0b9a850a17
chore: add comment
2022-01-25 17:28:28 +05:30
Saqib Ansari
a73ad6759d
fix(sales order): incorrect no. of items fetched while creating dn
2022-01-25 17:12:41 +05:30
Deepesh Garg
c6a17d1966
Merge pull request #29434 from frappe/mergify/bp/develop/pr-29404
...
fix: Previous document currency getting overridden (backport #29404 )
2022-01-25 15:50:06 +05:30
Marica
a707d3705c
Merge pull request #29426 from marination/mr-safeguard
...
fix: Use get for conditionally available fields while setting missing values
2022-01-25 12:51:40 +05:30
mergify[bot]
f469ec87d9
fix: broken patches (backport #29067 ) ( #29406 )
...
* chore: patch fixes
(cherry picked from commit 8b5b146f6d2720587a16f78a8d47840be8dca2b7)
# Conflicts:
# erpnext/patches/v13_0/make_homepage_products_website_items.py
* fix: remove desktop icons while deleting sales reports
(cherry picked from commit 5f72026cb932d01fc827c382747e996a94b441fd)
* refactor: dont ignore dangerous exceptions in patches
(cherry picked from commit 0aa1ea8aeb7757592616bd491de98c69fef08854)
* fix: make patch kinda idempotent
with previous query rerunning would've caused all values to become 0.
* chore: conflicts
* fix: check type before patching
Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-25 11:14:08 +05:30
Ankush Menat
b8fbfed096
fix: fetch "transfer material against" from BOM ( #29435 )
2022-01-24 21:45:51 +05:30
Deepesh Garg
b72cdb4bca
fix: Previous document currency getting overriden
...
(cherry picked from commit ef782fd35b0717e3f7c50dbb6c5dde7c96ae9ef6)
2022-01-24 15:19:54 +00:00
Rucha Mahabal
a1f0cb4ed1
fix: honour 'include holidays' setting while marking attendance for leave application ( #29425 )
2022-01-24 19:05:24 +05:30
Ankush Menat
3d3f0139fd
test: clear singles cache for changed settings ( #29430 )
2022-01-24 18:44:08 +05:30
marination
78b6b29a57
fix: Use get for conditionally available fields while setting missing values
...
- Due to custom field "supplier" and missing field "supplier_address", dot operator breaks
- Make sure to use "get" instead of just dot operator if field is in some doctypes, not all
2022-01-24 13:39:10 +05:30
Deepesh Garg
108d1045e6
Merge pull request #29360 from ruthra-kumar/test_case_deferred_report
...
test: unit test for deferred item with zero months
2022-01-24 12:41:37 +05:30
Deepesh Garg
34be90b396
Merge pull request #29407 from ruthra-kumar/dimension_in_opening_invoice
...
fix: opening invoice creation tool can fetch multiple accounting dimension
2022-01-24 12:36:20 +05:30
rohitwaghchaure
19b1b7f8cc
Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry
...
fix: incorrect raw materials quantity in manufacture stock entry
2022-01-24 12:13:54 +05:30
ChillarAnand
7086d3f3d7
Merge branch 'develop' into remove-nonprofit
2022-01-24 11:35:47 +05:30
Rohit Waghchaure
f8d232ac26
fix: incorrect raw materials quantity in manufacture stock entry
2022-01-24 11:35:06 +05:30
ChillarAnand
4bdf6248aa
refactor: Remove regional setup for non-profit
2022-01-24 11:06:11 +05:30
