Commit Graph

36710 Commits

Author SHA1 Message Date
Saqib
3b5978cdb8
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix
fix: purchase receipt gl entries with same item code
2021-06-24 19:29:08 +05:30
Ankush
7a63d782db
fix: batch nos in packed items (#26105)
* test: batch info in packed_items

* fix(ux): make packed items editable

* refactor: allow custom table name for set_batch

In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.

* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:07:16 +05:30
Deepesh Garg
acbf56f162
Merge pull request #26182 from deepeshgarg007/gstr_1_export_invoices_error_develop
fix: Export invoices not visible in GSTR-1 report
2021-06-24 18:43:40 +05:30
Anuja Pawar
a50196bcd9
fix: dunning permission error in payment entry (#26204) 2021-06-24 18:25:16 +05:30
Saqib
c10fea8a59
Merge branch 'develop' into pr-item-gl-fix 2021-06-24 17:39:36 +05:30
Saqib
2980db30ce
Merge pull request #26157 from nextchamp-saqib/pos-fixes-9
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 17:38:41 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix
fix: fetch preferred shipping address
2021-06-24 17:31:21 +05:30
Deepesh Garg
f84f8d5260
Update party.js 2021-06-24 17:29:55 +05:30
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
Nabin Hait
4704003c94 Merge branch 'version-13-pre-release' into version-13 2021-06-24 15:35:50 +05:30
Nabin Hait
b5d1a7731c bumped to version 13.5.2 2021-06-24 15:55:50 +05:50
Nabin Hait
7a8a449ed4
Merge pull request #26197 from deepeshgarg007/deferred_revenue_error_pre_release
fix: Error while booking deferred revenue
2021-06-24 15:34:58 +05:30
Saqib Ansari
4d3e748c00 fix: sider issues 2021-06-24 15:01:33 +05:30
Marica
bf3e191570
Merge pull request #26193 from marination/country-modal-cart-v13-release
fix: Address Card issues in e-commerce
2021-06-24 14:57:39 +05:30
Marica
b5ffaff6a8
Merge pull request #26194 from marination/web-item-group-v13-pre-release
fix: Website item group logic for product listing in Item Group pages
2021-06-24 14:57:29 +05:30
Deepesh Garg
f79a72dbf3 fix: Error while booking deferred revenue 2021-06-24 14:49:09 +05:30
Saqib
73aaa1c275
Merge branch 'develop' into pos-fixes-9 2021-06-24 14:31:19 +05:30
Saqib Ansari
8aa0e31bb4 fix: add missing semicolons 2021-06-24 14:29:22 +05:30
Noah Jacob
b2b7369874
fix(Work Order): added freeze when trying to stop work order (#26192)
* fix: added freeze when trying to stop work order

* fix(ux): add freeze message
2021-06-24 14:21:35 +05:30
marination
820a579051 chore: Test for Item visibility in multiple item group pages 2021-06-24 13:57:18 +05:30
marination
4f0e6cd911 fix: Sider 2021-06-24 13:57:00 +05:30
marination
f913838373 fix: Consider Table Multiselect fields in Query engine
- Since table multiselect fields were not handled, the query tried searching for this child field in item master
- This broke the query
- On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks
2021-06-24 13:56:49 +05:30
marination
9f305e983c fix: Filters did not consider Website Item Group 2021-06-24 13:56:35 +05:30
marination
ea2408744a fix: Consider Website Item Groups in Item group page product listing
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-06-24 13:56:15 +05:30
marination
5884f1aeb0 fix: (style) Address card buttons hover state 2021-06-24 13:50:29 +05:30
marination
26bec9d7b4 fix: Country Link field in 'Add address' website modal auto-clears 2021-06-24 13:50:18 +05:30
Jannat Patel
ca8c3b90f0
fix: Update leave allocation after submit (#25975)
* update leave allocation after submit

* fix: leave allocation update after submit

* fix: circular dependency

* fix: replaced update with submit in tests

* fix: replaced update with submit in tests

* fix: updating total leaves allocated
2021-06-24 13:13:03 +05:30
Deepesh Garg
ab7a16a952
Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop
fix: Billing address not fetched in Purchase Invoice
2021-06-24 12:13:17 +05:30
Deepesh Garg
5b119ac4a4
Merge pull request #26178 from deepeshgarg007/payroll_accounting_dimension_develop
fix: Accounting Dimensions for payroll entry accrual Journal Entry
2021-06-24 12:12:37 +05:30
Ganga Manoj
604f0b8f01
fix: message on successful creation of opening invoices (#25998) 2021-06-24 11:04:27 +05:30
Rucha Mahabal
7dbb032468
fix: chart not visible for First Response Time reports (#26032) 2021-06-24 10:41:56 +05:30
Deepesh Garg
2dc90dd8ac fix: Export invoices not visible in GSTR-1 report 2021-06-24 10:37:19 +05:30
Deepesh Garg
7bef18f3d8 fix: Remove unintentional changes 2021-06-24 10:28:25 +05:30
Deepesh Garg
c8a6b31f06 Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop 2021-06-24 10:27:16 +05:30
Deepesh Garg
da7f45130b fix: Billing address not fetched in Purchase Invoice 2021-06-24 10:25:24 +05:30
Deepesh Garg
5f5bbf622a
Merge pull request #26179 from deepeshgarg007/sales_order_billed_qty_develop
fix: Incorrect billed qty in Sales Order analytics
2021-06-24 10:22:07 +05:30
Deepesh Garg
70823b6d9a fix: Incorrect billed qty in Sales Order analytics 2021-06-24 10:21:17 +05:30
Deepesh Garg
c451f43f64 fix(minor): Translation and linting issues 2021-06-24 10:18:46 +05:30
Deepesh Garg
3da0541000 fix: Accouting Dimensions for payroll entry accrual Journal Entry 2021-06-24 10:18:36 +05:30
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI (#25837) 2021-06-24 10:09:02 +05:30
Noah Jacob
b4b6288596 fix: fetches correct preferred shipping address 2021-06-23 17:05:44 +05:30
Jannat Patel
da66cefefc
fix: staffing plan vacancies data type issue (#25936)
* fix: staffing plan vacancies data type issue

* fix: translation issue

* fix: removed greater than 0 condition

* fix: sider

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 14:04:48 +05:30
Anurag Mishra
d021db1cb1
fix: Training event (#26164)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:59:43 +05:30
Jannat Patel
0354ec6363
fix: job applicant link issue (#25933)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:27:45 +05:30
Anurag Mishra
11c155e6ce
feat: Employee Grievance (#25705) (#26162)
* feat: Employee Grievance

* feat: link to desk and automatic unsuspend

* test: Employee Grievance

* fix: Sider and Translation

* fix: sider

* fix: formatting

* feat: changes requested

* feat: Employee Grievance

* feat: link to desk and automatic unsuspend

* test: Employee Grievance

* fix: Sider and Translation

* fix: sider

* fix: formatting

* feat: changes requested

* fix: patch test and sider issue

* fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances

- show pay cut and suspension buttons only if Employee Resposible is set

- some label changes

* feat: added subject field for more context

- set title for documents

- added list view settings

- refactor suspend and unsuspend functions

- add submit and cancel perms for system and hr managers

- fix tests

* fix: sider issues

* fix: removed suspension and paycut

* fix:sider

* fix: test

* fix: test

* fix: resolved Conflicts

* fix: sider

* fix: remove debugging print statements

* fix: validation message

* fix: unnecessary comma

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-06-23 12:13:32 +05:30
Deepesh Garg
e8817f97d6
Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width
fix: Changed profitability analysis report width
2021-06-23 11:36:43 +05:30
Saqib
46ae97dfd3
Merge branch 'develop' into pr-item-gl-fix 2021-06-23 11:02:48 +05:30
Saqib
5a824cad81
fix: cannot cancel payment entry if linked with invoices (#26075) 2021-06-23 11:02:05 +05:30
Saqib
08c269510e
Merge branch 'develop' into pos-fixes-9 2021-06-23 10:15:07 +05:30
Saqib Ansari
75ce023170 fix: hide images from cart & details 2021-06-22 21:18:44 +05:30