Chillar Anand
cfda849a8a
Merge branch 'develop' into remove-nonprofit
2022-02-04 10:17:25 +05:30
Marica
79ab8e6459
Merge pull request #29456 from marination/product-bundle-packing-list-logic
...
fix: Incorrect packing list for recurring items & code cleanup
2022-02-03 22:09:52 +05:30
Marica
4d5749ba7d
Merge pull request #29625 from frappe/fix-web-portal
...
fix: Load control & dialog assets with `cart.js`
2022-02-03 22:04:33 +05:30
Marica
5e5a18f17c
Merge branch 'develop' into fix-web-portal
2022-02-03 21:59:57 +05:30
marination
017a882f90
fix: Remove cart.js from erpnext-web bundle
...
- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
2022-02-03 21:34:48 +05:30
Suraj Shetty
e652ab5f05
fix: Load control & dialog assets with cart.js
...
Previously, control & dialog assets were getting loaded only on visiting "/cart", but since cart.js sets up various events on homepage, dialog related assets are required up-front.
2022-02-03 20:06:24 +05:30
Wolfram Schmidt
68cea75909
chore: update de.csv #29575
...
added missing translations in Company Master
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@tueit.de>
[skip ci]
2022-02-03 20:05:11 +05:30
Wolfram Schmidt
af7570410e
chore: update de.csv ( #29624 )
...
minor translation error
[skip ci]
2022-02-03 20:04:24 +05:30
Ankush Menat
6f2c9c692c
ci: workflow dispatch options ( #29611 )
2022-02-03 17:30:42 +05:30
Ankush Menat
04f6426dbf
feat: show stock value difference in stock ledger report ( #29607 )
2022-02-03 17:14:57 +05:30
marination
f18ec2d947
fix: (Linter) import sequence
2022-02-03 17:07:11 +05:30
Marica
e9fc6c3249
Merge branch 'develop' into product-bundle-packing-list-logic
2022-02-03 17:02:57 +05:30
marination
4e7b4dc9a8
test: Packed Items test file
2022-02-03 17:01:33 +05:30
ChillarAnand
dddeef7179
chore: Clean up whitespace
2022-02-03 16:41:36 +05:30
ChillarAnand
325dc92d37
Merge branch 'develop' into remove-nonprofit
2022-02-03 16:38:01 +05:30
Ankush Menat
a7a2b82538
Merge pull request #29618 from frappe/mergify/copy/develop/pr-29603
...
fix: Multiple WO for a single Production Plan Item (copy #29603 )
2022-02-03 15:52:54 +05:30
Ankush Menat
9b60e3f187
fix: default qty if not found
2022-02-03 15:26:57 +05:30
ChillarAnand
899ca8b384
refactor: Code cleanup
2022-02-03 15:24:45 +05:30
Sagar Sharma
be09551cfa
test: add test case for multiple WO
...
(cherry picked from commit 36609c50c0332498ee088e6f44759f7c2747c733)
2022-02-03 09:50:08 +00:00
Sagar Sharma
360a06b9ba
fix: ordered_qty for production-plan-item
...
(cherry picked from commit 4e58c1da3ac1649d64377d53aec68e489a4a9d41)
2022-02-03 09:50:07 +00:00
Ankush Menat
551f2967da
Merge pull request #27923 from marination/e-commerce-refactor-develop
...
refactor: E-commerce (port to develop)
2022-02-03 14:14:08 +05:30
gavin
7eb9dc01f8
fix: Ignore mandatory fields if exist ( #27871 )
...
The goal of this fix is to not break the patch in case of customizations
In this particular case, it's regarding a customized Note DocType with
multiple custom mandatory fields
2022-02-03 14:08:32 +05:30
Ankush Menat
bd3b47fd50
fix: remove stale doctypes and add msg for ecommerce refactor ( #27700 )
2022-02-03 14:06:31 +05:30
marination
f97642e975
fix: Qb query, use isin instead of in and access fields without dot notation due to reserved pypika keywords
2022-02-03 14:03:17 +05:30
Ankush Menat
41a95e5624
fix: ignore empty customer/supplier in item query ( #29610 )
...
* fix: dont try to filter by customer/supplier if None
* test: item query with emtpy supplier
2022-02-03 13:02:13 +05:30
marination
f47db26fa6
fix: Cart buttons not working
...
- Add cart.js to web bundle
- Hide icon conditionally since now this file loads on every single page
2022-02-03 12:54:59 +05:30
Marica
384e6b559b
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 21:10:04 +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
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
