Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,716 Commits 3 Branches 0 Tags 1 GiB
15237fd747
Commit Graph

41716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
6f7ae62907 fix: Ignore linked invoices on Journal Entry cancel 2022-02-04 20:13:20 +05:30
marination
26bd3053d1 perf: Weed out disabled variants via sql query instead of pythonic looping separately 
- If the number of variants are large (almost 2lakhs), the query to get variants and attribute data takes time
- If the no.of disabled attributes is large as well, the list comprehension weeding out disabled variants takes forever
- We dont need to loop over the variants data so many times
- Avoid any `if a in list(b)` is best when the iterables have tremendous data
 2022-02-04 17:38:20 +05:30
Rucha Mahabal
dbfa463738 fix: show actual balance instead of consumption balance in opening balance 
- not changing opening balance based on remaining days
 2022-02-04 13:04:25 +05:30
Rucha Mahabal
b5c686ac40 fix: sort imports, sider issues 2022-02-04 12:39:58 +05:30
Rucha Mahabal
55ac8519bf refactor: balance in Balance Summary report near allocation expiry date 
- Leave Balance shows minimum leaves remaining after comparing with remaining days for allocation expiry causing ambiguity

- refactor remaining leaves calculation to return both, actual leave balance and balance for consumption

- show actual balance in leave application, use balance for consumption only in validations
 2022-02-04 12:29:00 +05:30
Saqib Ansari
9432d8edd1
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-04 10:20:43 +05:30
Chillar Anand
cfda849a8a
Merge branch 'develop' into remove-nonprofit 2022-02-04 10:17:25 +05:30
Rucha Mahabal
26b40e7cfd refactor: Leaves Taken calculation 
- fix issue where Leaves Taken also adds leaves expiring on boundary date as leaves taken, causing ambiguity

- remove unnecessary `skip_expiry_leaves` function

- `get_allocation_expiry` considering cancelled entries too
 2022-02-04 00:01:05 +05:30
Rucha Mahabal
1ea749cf1a fix: expired leaves not calculated properly because of newly created expiry ledger entries 2022-02-03 23:34:46 +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
ba847ef218
Merge branch 'develop' into provisonal_loss_bs 2022-02-03 17:18:00 +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
Deepesh Garg
233e6449fc fix: Zero rated exports in GSTR-3B report 2022-02-03 12:13:43 +05:30
Deepesh Garg
ed2c6b6637 fix: Incorrect provisional profit and loss in balance sheet 2022-02-02 22:36:45 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-02 21:47:51 +05:30
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
Deepesh Garg
ffec865e00 fix: Make a deep copy of GLE 2022-02-02 17:14:42 +05:30
Deepesh Garg
f1c3bcee1f fix: Deadlock on making reverse GL Entries 2022-02-02 17:09:34 +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