Marica
384e6b559b
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 21:10:04 +05:30
Subin Tom
ccf63124d6
fix: Coupon code item pricing dynamic updation issue
2022-02-02 20:13:33 +05:30
Saqib Ansari
f696eddceb
Merge pull request #29597 from nextchamp-saqib/fix-pos-checkout
...
fix(pos): pricing rule on transactions doesn't work
2022-02-02 19:48:05 +05:30
Saqib Ansari
e082e3f702
fix(pos): pricing rule on transactions doesn't work
2022-02-02 19:33:48 +05:30
Rucha Mahabal
da7494c208
fix: Program Enrollment tests ( #29592 )
2022-02-02 17:30:29 +05:30
marination
4b62d2d7fe
fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip
2022-02-02 12:58:31 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 10:45:14 +05:30
marination
8c90c505c0
fix: (minor) build issues on cart and item page
...
- Move `cart.js` to public/js directory
- Reorder import sequence in erpnext web bundle
- Removed unused script block
2022-02-02 10:40:45 +05:30
Nabin Hait
bf3caab63c
fix: future recurring period calculation
2022-02-01 23:42:50 +05:30
Nabin Hait
008b331f49
Merge branch 'cc-allocation' into develop
2022-02-01 22:27:23 +05:30
Nabin Hait
81d1ad6059
fix: Allocation percentage fieldtype changed to percent
2022-02-01 22:26:39 +05:30
Nabin Hait
364856b7c5
fix: patch for migrating cost center allocations
2022-02-01 22:26:03 +05:30
Nabin Hait
5f03292aba
fix: Future recurring period calculation for addl salary ( #29578 )
2022-02-01 21:47:15 +05:30
Rucha Mahabal
1710aef0a9
fix: employee reminders fixes ( #29548 )
2022-02-01 19:46:39 +05:30
Ankush Menat
a3a05c0c23
fix: don't show "create" on cancelled BOMs ( #29570 )
2022-02-01 17:40:06 +05:30
Saqib Ansari
4055cc76a7
Merge pull request #29556 from nextchamp-saqib/nemesis189-pos-service-items
...
feat: Allowing non stock items in POS
2022-02-01 16:36:10 +05:30
Rucha Mahabal
0dde0ece10
fix: leave application tests ( #29539 )
2022-02-01 16:00:02 +05:30
Saqib Ansari
bf70feb7c9
fix: flaky test
2022-02-01 15:26:33 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses ( #29451 )
...
* feat: Provisonal accounting for expenses
* fix: Method for provisional accounting entry
* chore: Add test case
* fix: Remove test case
* fix: Use company doctype
* fix: Add provisional expense account field in Purchase Receipt Item
* fix: Test case
* fix: Move provisional expense account to parent
* fix: Patch
2022-02-01 14:42:55 +05:30
ruthra kumar
9bd56b0f79
fix: typeerror on invoice creation from SO/PO
2022-02-01 14:14:04 +05:30
Saqib Ansari
4e4159ec06
chore: remove unused import
2022-02-01 14:02:52 +05:30
Saqib Ansari
2aca54eb38
chore: remove useless rollback
2022-02-01 13:17:01 +05:30
Saqib Ansari
650d44a714
test: point of sale search
2022-02-01 13:14:28 +05:30
Saqib Ansari
4557b6a150
Merge branch 'develop' into pos-service-items
2022-02-01 12:25:25 +05:30
Deepesh Garg
cb3754a102
Merge pull request #29535 from ruchamahabal/fix-loan-repayment
...
fix: do not hide Loan Repayment Entry field in salary slip
2022-02-01 12:18:47 +05:30
marination
9eeddc28b0
fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931
2022-02-01 12:15:48 +05:30
marination
2933cf243a
fix: Failing test, sider and linter
...
- Remove unused imports
- fix test `test_product_list_attribute_filter_builder`
2022-02-01 12:08:33 +05:30
rohitwaghchaure
62e5aa7d72
Merge pull request #29359 from KrithiRamani/foc_item
...
fix: bypass selling price validation for free item
2022-02-01 11:54:01 +05:30
Deepesh Garg
fa2b3eb414
Merge branch 'develop' into fix-loan-repayment
2022-02-01 11:12:39 +05:30
marination
1d7f313b92
debug: CI
2022-02-01 11:12:05 +05:30
marination
00752ca01d
fix: Wrong variable name breaks Cart Items rendering
2022-02-01 11:11:58 +05:30
marination
143ff715e7
fix: (test) set user for price test
2022-02-01 11:11:38 +05:30
marination
606f23b667
fix: Sider and Linter
2022-02-01 11:11:29 +05:30
marination
4f7ec25bbe
tests: Variant without web item price fetch and add to cart
...
- Also, optionally get image from template web item for cart if variant has no image
2022-02-01 11:11:18 +05:30
marination
47c8ad0b94
fix: Cart Logic of Item variant without Website Item
2022-02-01 11:11:11 +05:30
marination
f2fbe9049f
fix: Server Side test - teardown correctly
2022-02-01 11:10:04 +05:30
marination
2623046ba7
test: Variant Selector - Fetch next valid Attribute values fetching after selection of one
2022-02-01 11:09:46 +05:30
Sagar Sharma
c53cdce1c0
chore: remove patch
...
(cherry picked from commit fedeb2a70f80a39d31cb928d9876fbc94f27561c)
# Conflicts:
# erpnext/patches.txt
2022-02-01 05:39:39 +00:00
Sagar Sharma
ce0b84f54d
refactor: use frappe.qb instead of sql
...
(cherry picked from commit 0a9ec9f591f8b4d0e630a3c902b69c9996f080dd)
2022-02-01 05:39:39 +00:00
Sagar Sharma
edbf52ab95
feat: add patch
...
(cherry picked from commit fc65a3d9895c8ba9de957da820ed6b59c6c1bcbd)
# Conflicts:
# erpnext/patches.txt
2022-02-01 05:39:38 +00:00
Sagar Sharma
1fd8539873
fix: check so_detail before dn_detail
...
(cherry picked from commit 5de6b8dc4df407fd953efe69640e22bd4ea90b6e)
2022-02-01 05:39:38 +00:00
Sagar Sharma
b50036c04a
fix: consider returned_qty while updating billed_amt
...
(cherry picked from commit 63aaa1e357280b24c537a502a479f7bb7a6654e4)
2022-02-01 05:39:37 +00:00
marination
5a462db207
test: Variant Selector - Attribute Value fetching
2022-02-01 11:09:35 +05:30
marination
6c7b3026c9
fix: Behaviour if Item Variants Cache generation
...
- Revert to old behaviour where variant doesnt need to be published
- Delete unused functions
2022-02-01 11:08:30 +05:30
marination
20c71edc84
fix: Exclude unpublished items while fetching items from other item groups
2022-02-01 11:07:53 +05:30
Devin Slauenwhite
28e0c1acdc
fix(ux): tripple digit cart qty
2022-02-01 11:07:33 +05:30
Devin Slauenwhite
49cdf9b7b0
fix(e-commerce): shopping cart total quantity ( #29076 )
...
* fix: shopping cart total quantity
* fix: linter error
2022-02-01 11:06:33 +05:30
marination
45fadb5235
fix: Faulty 'continue' not setting value in db
2022-02-01 11:03:12 +05:30
marination
091a07c6df
fix: Code cleanup
2022-02-01 11:03:05 +05:30
marination
31a2485bcd
fix: Sider
2022-02-01 11:02:59 +05:30
