Deepesh Garg
|
e4e38ad60b
|
Merge branch 'develop' into sales_purchase_retrun_optimization
|
2022-03-13 12:45:10 +05:30 |
|
Saqib Ansari
|
e8a7a54d5a
|
fix(pos): do not reset mode of payments in case of consolidation
|
2022-03-12 19:20:48 +05:30 |
|
mergify[bot]
|
b085e96a12
|
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807)
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"
This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.
* fix: linter
(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)
# Conflicts:
# erpnext/patches.txt
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
|
2022-03-11 18:28:50 +05:30 |
|
Ankush Menat
|
94d0f8d4e7
|
test: actual bom naming test
|
2022-03-11 17:11:22 +05:30 |
|
Rohan Bansal
|
67d8a7ba86
|
fix: cancelled document check
|
2022-03-11 17:11:22 +05:30 |
|
Ankush Menat
|
6b58d53403
|
refactor: split versioning code for testability
|
2022-03-11 17:11:22 +05:30 |
|
Rohan Bansal
|
7f2670941c
|
fix: improve bom autoname logic
|
2022-03-11 17:11:22 +05:30 |
|
Ankush Menat
|
e2c99e02a9
|
test: bom for item_code that is >VARCHAR_LEN
|
2022-03-11 17:11:22 +05:30 |
|
Rohan Bansal
|
d9c91748f4
|
fix: if an item code is too long, truncate before setting BOM name
|
2022-03-11 17:11:22 +05:30 |
|
Rucha Mahabal
|
8173e6a8ea
|
fix: simplify insufficient leave balance message
|
2022-03-11 15:30:01 +05:30 |
|
Deepesh Garg
|
13dce71c21
|
Merge pull request #30181 from deepeshgarg007/shipping_rule_application
fix: Shipping rule application fixes
|
2022-03-11 12:04:12 +05:30 |
|
Deepesh Garg
|
d596e0e4df
|
fix: Shipping rule application fixes
|
2022-03-10 20:56:36 +05:30 |
|
Ankush Menat
|
472fe8e319
|
test: submit PR directly
|
2022-03-10 18:08:29 +05:30 |
|
Ankush Menat
|
6c54be0dcd
|
test: flaky MR report test
all test records are on same day so sorting was random in report rows.
|
2022-03-10 18:08:29 +05:30 |
|
Ankush Menat
|
7dd10367f4
|
fix: only update valuation rate if not None
|
2022-03-10 18:08:29 +05:30 |
|
Ankush Menat
|
362102e802
|
fix: dont hardcode hour rate precision
|
2022-03-10 17:23:50 +05:30 |
|
Ankush Menat
|
18e2a33a9b
|
fix: fetch new fields in bom from routing
|
2022-03-10 17:23:50 +05:30 |
|
Ankush Menat
|
73901aad6f
|
fix: handle duplicate bins during item merge renames
|
2022-03-10 17:01:22 +05:30 |
|
Ankush Menat
|
b4d4ae6aa3
|
test: refactor item merge test and disable commits
|
2022-03-10 17:01:22 +05:30 |
|
Ankush Menat
|
4126455975
|
fix: dont reset UOM in MR on every get_item_detail call (#30164)
|
2022-03-10 15:43:09 +05:30 |
|
Rucha Mahabal
|
b2c549a464
|
fix: conflicts
|
2022-03-10 15:41:14 +05:30 |
|
Raffael Meyer
|
6794148c04
|
fix(lead): reload contact before updating links (#29966)
* fix(lead): reload contact before updading links
Contact might have changed since it was created.
* refactor: reload contact after insert
|
2022-03-10 14:47:29 +05:30 |
|
Rucha Mahabal
|
79b0354efc
|
Merge branch 'develop' into leave-opening-balance
|
2022-03-10 14:45:46 +05:30 |
|
Marica
|
93e9fe8327
|
Merge pull request #30160 from marination/cart-without-checkout
fix: 'save_quotations_as_draft' checkbox not honoured
|
2022-03-10 14:37:58 +05:30 |
|
Saqib Ansari
|
390feeaa73
|
Merge pull request #30103 from ChillarAnand/party
fix: Ignore missing customer group while fetching price list
|
2022-03-10 14:36:19 +05:30 |
|
Rucha Mahabal
|
9fae89ff61
|
fix: flaky tests (#30154)
|
2022-03-10 14:22:12 +05:30 |
|
Deepesh Garg
|
a5befb6bf8
|
fix: Update modified timestamp
|
2022-03-10 14:18:54 +05:30 |
|
Saqib Ansari
|
e5fb871ef4
|
fix: Ignore missing customer group while fetching price list
|
2022-03-10 13:54:43 +05:30 |
|
marination
|
a13e06156b
|
fix: 'save_quotations_as_draft' checkbox not honoured
- Make sure `request_for_quotation` considers `save_quotations_as_draft`
- Added test for checkout disabled quote
|
2022-03-10 13:54:00 +05:30 |
|
Saqib Ansari
|
9dc9758522
|
Merge branch 'develop' of https://github.com/frappe/erpnext into party
|
2022-03-10 13:51:36 +05:30 |
|
Himanshu
|
5193a63781
|
fix: do not reset asset_category (#29696)
|
2022-03-10 13:43:35 +05:30 |
|
Saqib Ansari
|
2bcddab553
|
Merge pull request #30153 from nextchamp-saqib/fix-psoa-template
fix(psoa): no such element: dict object['account']
|
2022-03-10 13:12:23 +05:30 |
|
Deepesh Garg
|
e9d458b822
|
fix: Update party type
|
2022-03-10 12:29:17 +05:30 |
|
Deepesh Garg
|
5d66cc4c4a
|
fix: Add cost center in loan document
|
2022-03-10 12:22:37 +05:30 |
|
Saqib Ansari
|
8021572432
|
Merge branch 'develop' into fix-psoa-template
|
2022-03-10 12:17:11 +05:30 |
|
Ankush Menat
|
84568ac341
|
chore: imports
|
2022-03-10 11:20:23 +05:30 |
|
Saqib Ansari
|
5d5ae16fe5
|
fix(psoa): no such element: dict object['account']
|
2022-03-10 11:12:33 +05:30 |
|
Saqib Ansari
|
45c1d83ea1
|
Merge pull request #30145 from nextchamp-saqib/add-filter-to-psoa
fix(psoa): add company filter to account
|
2022-03-10 10:53:52 +05:30 |
|
Deepesh Garg
|
395b15058c
|
fix: Sales and Purchase retrun optimization
|
2022-03-10 10:50:03 +05:30 |
|
Rucha Mahabal
|
f066427913
|
fix: program enrollment button labels (#30148)
|
2022-03-10 10:06:07 +05:30 |
|
Saqib Ansari
|
fc42041f8f
|
fix(psoa): add company filter to account
|
2022-03-09 18:04:35 +05:30 |
|
Chillar Anand
|
fe4b6771b5
|
refactor: Remove dead code (#30140)
|
2022-03-09 17:16:05 +05:30 |
|
Chillar Anand
|
b1c8a4543d
|
test: Added test for monthly attendance report (#29989)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2022-03-09 17:05:00 +05:30 |
|
Rucha Mahabal
|
921d6b25d7
|
chore: linter issue
|
2022-03-09 16:58:15 +05:30 |
|
Deepesh Garg
|
45eed7167c
|
Merge pull request #29654 from alyf-de/revert-bu-schluessel
revert: BU Schlüssel (a21f76f)
|
2022-03-09 16:48:54 +05:30 |
|
Marica
|
2661cb2c14
|
Merge pull request #30091 from marination/item-group-filters-listing
feat: Include child item group products in Item Group Page & cleanup
|
2022-03-09 16:46:01 +05:30 |
|
Saqib Ansari
|
4d8798b0ea
|
fix: ignore non-unique swift numbers while migrating (#30132)
|
2022-03-09 16:41:54 +05:30 |
|
Saqib Ansari
|
17e16247b1
|
Merge pull request #30114 from nextchamp-saqib/fix-#23231
perf(asset): fetch only distinct depreciable assets
|
2022-03-09 16:41:08 +05:30 |
|
Rucha Mahabal
|
9b152e93cf
|
Merge branch 'develop' into leave-opening-balance
|
2022-03-09 16:40:26 +05:30 |
|
Rucha Mahabal
|
97b7b5012e
|
test: separate leave ledger entries for leave applications across allocations
|
2022-03-09 16:35:25 +05:30 |
|