Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,113 Commits 3 Branches 0 Tags 1 GiB
87d448e039
Commit Graph

37113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI (#26184) 2021-06-24 14:26:36 +05:30
Ankush
98e98d25e6
fix(Work Order): added freeze when trying to stop work order (#26192) (#26196) 
* fix: added freeze when trying to stop work order

* fix(ux): add freeze message

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-06-24 14:24:28 +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
Deepesh Garg
ca2e914715 fix: Error while booking deferred revenue 2021-06-24 14:14:46 +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
Marica
ce99701150
Merge pull request #26170 from marination/web-item-group 
fix: Website item group logic for product listing in Item Group pages
 2021-06-24 13:28:18 +05:30
GangaManoj
550fe8ae39 fix(Asset): Remove redundant code 2021-06-24 13:22:26 +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
marination
a4f5dcaa9a chore: Test for Item visibility in multiple item group pages 2021-06-24 13:08:20 +05:30
GangaManoj
60a44ae1e6 fix(Asset): Fix test 2021-06-24 12:44:13 +05:30
Marica
6b15a05de4
Merge pull request #26187 from marination/country-modal-cart 
fix: Address Card issues in e-commerce
 2021-06-24 12:25:21 +05:30
Deepesh Garg
437e972108
Merge pull request #26143 from deepeshgarg007/gstr_1_export_invoices_error 
fix: Export invoices not visible in GSTR-1 report
 2021-06-24 12:15:29 +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
Deepesh Garg
9d8e8f8bdf fix: Do not show received amount after tax for internal tarnsfers 2021-06-24 12:02:39 +05:30
Deepesh Garg
bd9317956b fix: Taxes on Internal Transfer payment entry 2021-06-24 12:02:32 +05:30
marination
bbe64b5604 fix: (style) Address card buttons hover state 2021-06-24 12:01:12 +05:30
Rucha Mahabal
a9b5dc6030
fix: chart not visible for First Response Time reports (#26032) (#26185) 2021-06-24 11:53:28 +05:30
Ganga Manoj
604f0b8f01
fix: message on successful creation of opening invoices (#25998) 2021-06-24 11:04:27 +05:30
marination
f5fa1ee4b6 fix: Country Link field in 'Add address' website modal auto-clears 2021-06-24 11:03:32 +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
269962a8dc fix: Check if item tax template exists 2021-06-24 10:40:07 +05:30
Deepesh Garg
808f83f385 fix: Make item tax templates optional 2021-06-24 10:39:58 +05:30
Deepesh Garg
94d460412a fix: User is not able to change item tax template 2021-06-24 10:39:49 +05:30
Deepesh Garg
5e49bee755
Merge pull request #26083 from deepeshgarg007/payroll_accounting_dimension 
fix: Accounting Dimensions for payroll entry accrual Journal Entry
 2021-06-24 10:38:42 +05:30
Deepesh Garg
2dc90dd8ac fix: Export invoices not visible in GSTR-1 report 2021-06-24 10:37:19 +05:30
Deepesh Garg
03b629c851
Merge pull request #26100 from deepeshgarg007/pi_billing_address 
fix: Billing address not fetched in Purchase Invoice
 2021-06-24 10:29:01 +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
4cf0b02ddc
Merge pull request #26095 from deepeshgarg007/sales_order_billed_qty 
fix: Incorrect billed qty in Sales Order analytics
 2021-06-24 10:21:57 +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
Deepesh Garg
3007c9900b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension 2021-06-23 23:06:15 +05:30
Deepesh Garg
7e006496dd fix: Check if item tax template exists 2021-06-23 22:52:51 +05:30
Deepesh Garg
c9c1d10435 fix: Make item tax templates optional 2021-06-23 22:47:29 +05:30
GangaManoj
dce2113736 fix(Asset Repair): Remove test that's no longer necessary 2021-06-23 22:26:45 +05:30
GangaManoj
2f5f9d8566 fix(Asset): Fix value_after_depreciation calculation 2021-06-23 22:19:05 +05:30
Deepesh Garg
1f7b95f390 fix: User is not able to change item tax template 2021-06-23 20:56:27 +05:30