Commit Graph

40399 Commits

Author SHA1 Message Date
marination
9fb61efba8 chore: Fix imports and formatting (linter) & Sider (unused import) 2022-02-01 00:54:54 +05:30
marination
b2b827f50f chore: Adjust to ESbuild and missing imports
- update erpnext web bundle and tweak to fit new build system
- change page id in scss due to change in v14 router
- add missing imports
2022-02-01 00:03:08 +05:30
Deepesh Garg
dcd99a82cb
Merge pull request #29536 from nabinhait/cost-center-allocation
feat: Cost Center Allocation
2022-01-31 21:27:15 +05:30
Nabin Hait
5b0ec6437b fix: sider issues 2022-01-31 18:41:42 +05:30
Nabin Hait
6099af5d00 fix: Fixed test case and sider issues 2022-01-31 17:43:37 +05:30
Ankush Menat
bba31a37f4 fix: missing validate_item_group_defaults function 2022-01-31 17:15:17 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Nabin Hait
3dadfc9048 patch: Removed files and code related to old distributed cost center feature 2022-01-31 15:58:40 +05:30
rohitwaghchaure
f026ec6bad
Merge pull request #29522 from ankush/drop_bom_level
refactor!: dynamically compute bom_level
2022-01-31 15:58:25 +05:30
Ankush Menat
a254201696
chore: revert manual handling of stock level section (#29537) 2022-01-31 15:37:19 +05:30
Rucha Mahabal
1361f88f67 fix: do not hide Loan Repayment Entry field in salary slip 2022-01-31 14:53:13 +05:30
Ankush Menat
5aa1b6bc38
Merge pull request #29519 from ankush/unique_bin
fix: bin uniqueness
2022-01-31 14:29:22 +05:30
Ankush Menat
0a15334464 fix: update reserved qty for production/ s/c 2022-01-31 14:10:42 +05:30
Nabin Hait
c09d5a613e fix: Delete old fields from cost center related to distributed cost center 2022-01-31 13:26:09 +05:30
Nabin Hait
ce49e6ccf7 fix: Resolved conflicts in patches 2022-01-31 13:25:44 +05:30
Nabin Hait
174104c0d4 feat: Workspace link for Cost Center Allocation 2022-01-31 13:24:18 +05:30
Nabin Hait
004c1ed094 feat: Split Gl Entry based on cost center allocation 2022-01-31 13:24:18 +05:30
Nabin Hait
ac2e19103f Cost Center Allocation doctype, validations and test cases 2022-01-31 13:24:18 +05:30
Nabin Hait
d71d3e3b3e fix: Minor issues in existing patches 2022-01-31 13:24:18 +05:30
Subin Tom
05bbb69d0e
fix: Validation for invalid serial nos at POS invoice level (#29447) 2022-01-31 13:08:19 +05:30
Anupam Kumar
896adc3759
fix: not able to declare opportunity lost without competitors (#29531) 2022-01-31 12:09:54 +05:30
Saqib Ansari
6b377703b3
Merge pull request #29454 from nextchamp-saqib/fix-dn-mapping
fix(sales order): incorrect no. of items fetched while creating dn
2022-01-31 11:38:57 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing
revert: "refactor!: drop e-invoicing integration from erpnext"
2022-01-31 11:35:48 +05:30
Himanshu
319322228a
fix: fetch image form item (#29523) 2022-01-31 10:56:00 +05:30
Ankush Menat
d38fd8635c fix(ux): sort multi-production item plans correctly 2022-01-30 22:58:30 +05:30
Ankush Menat
157b4b33fe refactor!: dynamically compute bom_level 2022-01-30 22:06:24 +05:30
aaronmenezes
0f7c2a19de
fix: cost of poor quality report time filters not working (#28958)
* fix: cost of poor quality report time filters not working

* chore:update cost of poor quality report to use query builder

* fix: linter warnings

* chore: updated report query

* chore: added test filters

* fix : cleared linter warnings

* chore: formatting

* refactor: query generation

- optionally apply date filters
- join instead of expensive sub-query
- return as dictionary

* test: simplify test

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-30 20:22:39 +05:30
Ankush Menat
c2ecc7a2d1 refactor: patch for fixing broken bins
fix(patch): delete fully broken bins

if bin doesn't have item_code or warehouse then it's not recoverable.
2022-01-30 18:43:02 +05:30
Sagar Sharma
7ff3ca25e5 fix(patch): patch duplicate bins 2022-01-30 18:43:02 +05:30
Ankush Menat
a1e7771cdd fix: ignore None item/wh whie updating reservation 2022-01-30 18:43:02 +05:30
Ankush Menat
08810dbcce fix: add unique constraint on bin at db level 2022-01-30 18:42:59 +05:30
smehata
b818b93568
Update sales_invoice.js (#29491)
undefined issue
2022-01-30 17:27:20 +05:30
Deepesh Garg
d41f71acb7
Merge pull request #29499 from deepeshgarg007/overseas_gst_tax
fix(India): Tax calculation for overseas suppliers
2022-01-30 11:36:54 +05:30
Anupam Kumar
925eca0e4a
fix: multiple CRM fixes (#29507)
* fix: multiple CRM fixes
2022-01-29 22:32:03 +05:30
Rucha Mahabal
cc4b4046ce
Merge pull request #29506 from ruchamahabal/fix-interview-ratings 2022-01-29 21:51:30 +05:30
Rucha Mahabal
0d5993d288
Merge branch 'develop' into fix-interview-ratings 2022-01-29 21:24:46 +05:30
Rucha Mahabal
d98290bfb9 test: get interview details for applicant dashboard
- rectify tests as per new rating field changes (fractional and configurable)
2022-01-29 21:15:49 +05:30
Rucha Mahabal
d96f4bf628 fix: move average calculation to interview controller 2022-01-29 20:27:15 +05:30
Rucha Mahabal
69eb3a0ac9 fix: interview ratings on job applicant dashboard 2022-01-29 20:05:07 +05:30
Rucha Mahabal
5d85c5a660 fix: designation mapping from job applicant to job offer
- group create buttons
2022-01-29 20:04:40 +05:30
Deepesh Garg
92416d80e6
Merge branch 'develop' into overseas_gst_tax 2022-01-29 18:48:23 +05:30
Saqib Ansari
b8802a3315 fix: patch order 2022-01-29 18:31:55 +05:30
Deepesh Garg
eba06212e8
Merge pull request #29350 from deepeshgarg007/asset_split
feat: Splitting group assets
2022-01-29 16:12:04 +05:30
Rucha Mahabal
36882f3734
fix: Employee Onboarding and Separation UX (#29504) 2022-01-29 15:27:36 +05:30
Ankush Menat
43bd88e741 fix: work order serial no allows storing whitespace 2022-01-29 14:01:21 +05:30
Ankush Menat
e177c5277f fix: extend sr_no cleanup to packed items too 2022-01-29 14:01:21 +05:30
Ankush Menat
b20df3745e refactor: reusable clean_serial_nos 2022-01-29 14:01:21 +05:30
Ankush Menat
14e3e163ae fix: ignore alternate item while checking pending qty 2022-01-29 13:59:25 +05:30
Deepesh Garg
36bff953b0
Merge pull request #29501 from frappe/mergify/bp/develop/pr-29428
fix: Add shipping charges to taxes only if applicable (backport #29428)
2022-01-29 13:55:48 +05:30
Deepesh Garg
2bf405d44c fix:Add shipping charges to taxes only if applicable
(cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)
2022-01-29 07:27:21 +00:00