Deepesh Garg
dce2676f7a
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax
2021-06-24 21:08:57 +05:30
Deepesh Garg
c151c67d97
fix: Flaky test
2021-06-24 21:08:19 +05:30
Ankush
2ea750eadd
perf: don't query unless required ( #26175 )
...
re-order conditionals so queries are not evaluated unless required.
2021-06-24 20:29:18 +05:30
Noah Jacob
0ceec76d98
refactor: update cost updates operation time and hour rates in BOM (fp #25891 )
...
* refactor: updates hour_rate and operation time on update cost
* refactor: hour_rates are updated in routing when updated in workstations
* test: test cases for updating hour_rates and operation time in linked bom
2021-06-24 20:27:47 +05:30
Nabin Hait
67768faaef
Merge branch 'version-13-hotfix' into version-13-pre-release
2021-06-24 20:16:04 +05:30
Deepesh Garg
b4b76b75cd
Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix
...
fix: User is not able to change item tax template
2021-06-24 19:55:49 +05:30
Deepesh Garg
970d2af7ad
Merge pull request #26211 from deepeshgarg007/include_dimension_filter
...
fix: Account filter not working with accounting dimension filter
2021-06-24 19:55:12 +05:30
Deepesh Garg
1564d39bf4
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13
...
fix: Taxes on Internal Transfer payment entry
2021-06-24 19:51:48 +05:30
Deepesh Garg
e3ca177828
fix: Remove debug flag
2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5
fix: Account filter not working with accounting dimension filter
2021-06-24 19:48:11 +05:30
Ankush
5708b7140b
fix: batch nos in packed items (bp #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:38:37 +05:30
Noah Jacob
ac0bc1f170
fix: precision rate for packed items ( #26208 )
2021-06-24 19:36:17 +05:30
Saqib
b3a0a7b432
fix: too many writes while renaming company abbreviation ( #26203 )
2021-06-24 19:30:10 +05:30
Saqib
64c6b34b94
fix: too many writes while renaming company abbreviation ( #26142 )
2021-06-24 19:29:56 +05:30
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
Deepesh Garg
1658107a92
fix: Linting fixes
2021-06-24 19:18:50 +05:30
Deepesh Garg
e21e435a0d
fix: Add python 3 compatible string types
2021-06-24 19:17:58 +05:30
Nabin Hait
a57976660a
fix: merge conflict
2021-06-24 19:14:33 +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
9382b1f154
fix: Flaky test
2021-06-24 19:03:22 +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
Deepesh Garg
11591b3e3e
Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13
...
fix: purchase receipt gl entries with same item code
2021-06-24 18:36:23 +05:30
Anuja Pawar
a50196bcd9
fix: dunning permission error in payment entry ( #26204 )
2021-06-24 18:25:16 +05:30
rohitwaghchaure
27797ffa46
Merge pull request #24523 from rohitwaghchaure/sub-operation-new-branch
...
Feat: Job Card Enhancements
2021-06-24 18:19:42 +05:30
Rohit Waghchaure
2330c41cca
fix: total time calculation
2021-06-24 18:14:19 +05:30
Rohit Waghchaure
57307443f0
is corrective job card
2021-06-24 18:14:19 +05:30
Rohit Waghchaure
c878389050
fix: or condition filter in the get_all
2021-06-24 18:14:18 +05:30
Jannat Patel
6a9798f305
fix: update leave allocation after submit ( #26191 )
...
* fix: update leave allocation after submit v13
* fix: test
* fix: test
2021-06-24 18:11:33 +05:30
Rohit Waghchaure
fcab53b238
fix: skip job card
2021-06-24 18:07:31 +05:30
Rohit Waghchaure
6e81489095
feat: Job Card Enhancements
2021-06-24 18:07:30 +05:30
Saqib Ansari
f6dce4df73
test: service item purchase with perpetual inventory enabled
2021-06-24 17:41:52 +05:30
Saqib Ansari
1ca8f6a51d
fix: purchase receipt gl entries with same item code
2021-06-24 17:41:44 +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
Saqib
81d164134d
Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13
...
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 17:37:51 +05:30
Afshan
9dc625c1c9
fix: validate product bundle for existing transactions before deletion ( #25978 )
2021-06-24 17:36:39 +05:30
Deepesh Garg
79daed00c1
Merge pull request #26201 from noahjacob/shipping_address_fix_v13
...
fix: fetch preferred shipping address (bp #26132 )
2021-06-24 17:35:34 +05:30
Deepesh Garg
755ebdf582
Update party.js
2021-06-24 17:35:14 +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
Noah Jacob
da82bd4b51
refactor: update cost updates operation time and hour rates in BOM ( #25891 )
...
* refactor: updates hour_rate and operation time on update cost
* refactor: hour_rates are updated in routing when updated in workstations
* test: test cases for updating hour_rates and operation time in linked bom
2021-06-24 17:23:21 +05:30
Noah Jacob
dbdf2515cd
fix: fetches correct preferred shipping address
2021-06-24 17:06:18 +05:30
Nabin Hait
5b462ad11a
fix: merge conflict
2021-06-24 15:36:51 +05:30
Nabin Hait
b5d1a7731c
bumped to version 13.5.2
2021-06-24 15:55:50 +05:50
Nabin Hait
c1954ec72a
Merge pull request #26195 from deepeshgarg007/deferred_revenue_error
...
fix: Error while booking deferred revenue
2021-06-24 15:35:02 +05:30
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
GangaManoj
e21d44c5c3
fix(Asset): Remove to_date field
2021-06-24 15:04:44 +05:30
Saqib Ansari
3b12601461
fix: sider issues
2021-06-24 15:03:04 +05:30
Saqib Ansari
e39c3f2e69
fix: add missing semicolons
2021-06-24 15:02:59 +05:30
Saqib Ansari
ea70f6f933
fix: hide images from cart & details
2021-06-24 15:02:53 +05:30
Saqib Ansari
54cc1dedf2
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 15:02:43 +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
GangaManoj
2fdb923953
fix(Asset Repair): Change controller hooks
2021-06-24 14:56:34 +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
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
marination
078826d510
fix: Sider
2021-06-23 20:12:59 +05:30
marination
f913e0dd05
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-23 20:06:11 +05:30
Noah Jacob
b4b6288596
fix: fetches correct preferred shipping address
2021-06-23 17:05:44 +05:30
rohitwaghchaure
b4863bfa50
Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report
...
feat: Incorrect valuation rate report for serialized items
2021-06-23 16:52:51 +05:30
marination
1b9b72d12e
fix: Filters did not consider Website Item Group
2021-06-23 16:03:24 +05:30
marination
d802d73973
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-23 14:24:13 +05:30
Jannat Patel
9ec0ded28f
fix: Staffing plan vacancies data type issue ( #25941 )
...
* fix: staffing plan vacancies data type issue
* fix: translation issue
* fix: removed greater than 0 condition
2021-06-23 14:05:10 +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
GangaManoj
80399802c6
fix(Asset Repair): Replace asset_value with value_after_depreciation in tests
2021-06-23 13:26:47 +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
44815393b3
fix: job applicant link issue ( #25934 )
2021-06-23 12:28:02 +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
Anurag Mishra
fc98abece9
feat: Employee Grievance ( #25705 )
...
* 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>
2021-06-23 11:21:38 +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
Saqib Ansari
3b225b13e8
refactor(pos): use pos invoice item name as unique identifier
2021-06-22 21:18:20 +05:30
Deepesh Garg
dc6e4f12c6
Merge pull request #26076 from nextchamp-saqib/export-round-off-fix
...
fix(e-invoicing): IRN generation for export invoices with round off
2021-06-22 20:45:24 +05:30
Deepesh Garg
7b0d86ead5
fix: Do not show received amount after tax for internal tarnsfers
2021-06-22 20:38:35 +05:30
Deepesh Garg
2af8c171c1
fix: Taxes on Internal Transfer payment entry
2021-06-22 19:48:08 +05:30
Noah Jacob
ce72d0c2c1
fix: fixed rounding off ordered percent to 100 in condition ( #26148 )
2021-06-22 17:54:16 +05:30
Noah Jacob
c05496a5a7
fix: fixed rounding off ordered percent to 100 in condition ( #26152 )
2021-06-22 17:53:53 +05:30
GangaManoj
2e45965405
fix(Asset Repair): Fix Sider issues
2021-06-22 17:24:14 +05:30
GangaManoj
859c8c92f7
fix: Remove changes made to Asset Maintenance
2021-06-22 17:16:12 +05:30
Subin Tom
a446d61e10
fix: Changed profitability analysis report width
2021-06-22 16:51:15 +05:30
GangaManoj
2ea325c0c3
fix(Asset Repair): Revert Stock Entry on cancellation
2021-06-22 16:33:10 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice ( #26125 )
2021-06-22 16:28:58 +05:30
GangaManoj
3a44d88866
fix(Asset): Fix tests for Asset Repair
2021-06-22 16:28:29 +05:30
Subin Tom
e3a697c582
fix: disable sales order cancellation if linked to draft invoice ( #26104 )
2021-06-22 16:27:53 +05:30
Subin Tom
889140fd8c
fix: sql syntax error in get_project_name method ( #26147 )
2021-06-22 16:26:19 +05:30
GangaManoj
3b0eac79bf
fix(Asset Repair): Compute total_value
2021-06-22 16:26:09 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor
2021-06-22 16:21:13 +05:30
Subin Tom
943b46a759
fix: sql syntax error in get_project_name method ( #26145 )
2021-06-22 14:26:36 +05:30
Deepesh Garg
cfdda21dd2
fix: Export invoices not visible in GSTR-1 report
2021-06-22 13:03:22 +05:30
marination
c212d7fafd
fix: Sort website products by weightage mentioned in Item master
2021-06-22 11:20:23 +05:30
Dany Robert
884dd9764b
Merge branch 'develop' into patch-4
2021-06-22 11:18:17 +05:30
rohitwaghchaure
82adb4f16e
Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-21 22:36:03 +05:30
marination
f97206b3cb
fix: Sort website products by weightage mentioned in Item master
2021-06-21 19:38:37 +05:30
GangaManoj
5776a962b3
fix(Asset Repair): Return Depreciation Schedule to original state on cancellation
2021-06-21 18:57:11 +05:30
rohitwaghchaure
6a07869e55
Update production_plan.js
2021-06-21 15:41:30 +05:30
Noah Jacob
38f105eaee
test: test cases for fetching customer group details
2021-06-21 15:40:13 +05:30
Rohit Waghchaure
00c05108b2
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:49 +05:30
rohitwaghchaure
d6eacf556d
Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse
...
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:13 +05:30
Noah Jacob
acef77fb53
test: test case for fetching supplier group details
2021-06-21 15:39:05 +05:30
rohitwaghchaure
8347eb1dba
Update production_plan.js
2021-06-21 15:38:44 +05:30
Noah Jacob
89215e44a4
feat: details fetched from customer group in customer
2021-06-21 15:37:17 +05:30
Noah Jacob
ffe306c2f6
feat: details fetched from supplier group in supplier
2021-06-21 15:36:46 +05:30
GangaManoj
91a99e0d89
fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation
2021-06-21 15:22:02 +05:30
GangaManoj
f88a13b292
fix(Asset Repair): Compute total_value instantly
2021-06-21 15:02:40 +05:30
Rohit Waghchaure
01faa9ca11
fix: rate not able to change in purchase order
2021-06-21 14:56:38 +05:30
GangaManoj
a34bf5edec
fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'
2021-06-21 14:55:34 +05:30
Rohit Waghchaure
773aabae44
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 14:54:27 +05:30
GangaManoj
b081d79332
fix(Asset Repair): Fix tests
2021-06-21 14:52:00 +05:30
rohitwaghchaure
3956f82e7c
Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change
...
fix: rate not able to change in purchase order
2021-06-21 13:40:29 +05:30
Nabin Hait
27f0495156
Merge branch 'version-13' into develop
2021-06-21 11:28:58 +05:30
Nabin Hait
94484d7766
bumped to version 13.5.1
2021-06-21 11:48:57 +05:50
Afshan
127d637b3d
fix: check for duplicate payment terms in Payment Term Template ( #25999 )
2021-06-21 11:24:45 +05:30
Ankush
7dae0fbe95
fix: status indicator for delivery notes (bp #26062 )
...
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.
This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
2021-06-21 11:19:47 +05:30
Saqib Ansari
9b54aee43e
test: service item purchase with perpetual inventory enabled
2021-06-21 11:18:56 +05:30
Saqib Ansari
d329e27346
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix
2021-06-21 11:18:45 +05:30
Ankush
e78364c191
fix: status indicator for delivery notes ( #26062 )
...
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.
This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
2021-06-21 11:15:16 +05:30
Saqib
d8d3e536e0
Merge branch 'develop' into export-round-off-fix
2021-06-21 10:52:12 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' ( #26096 )
2021-06-21 10:48:50 +05:30
Saqib Ansari
99531a35e0
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
2021-06-21 10:47:23 +05:30
Rohit Waghchaure
582f187726
fix: rate not able to change in purchase order
2021-06-21 00:59:02 +05:30
GangaManoj
740df95c58
fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'
2021-06-20 17:44:35 +05:30
Rohit Waghchaure
f0dfea1d47
fix: test case for Project Profitability report
2021-06-20 15:31:25 +05:30
Rohit Waghchaure
e5fb23972a
fix: available qty for consumption
2021-06-20 15:28:25 +05:30
Rohit Waghchaure
110e152fa3
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8
fix: code cleanup and convert public method to private for subcontracting class
2021-06-20 15:27:04 +05:30
Rohit Waghchaure
d755b29943
fix: toggle consumed qty field based on condition
2021-06-20 15:27:04 +05:30
Rohit Waghchaure
21b58ef045
fix: semgrep error
2021-06-20 15:27:04 +05:30
Rohit Waghchaure
7b7ceaadd9
feat: subcontract code refactor and enhancement
2021-06-20 15:27:01 +05:30
Rohit Waghchaure
9e616b09a2
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-20 15:17:20 +05:30
rohitwaghchaure
ab3cd7e283
Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-20 15:16:32 +05:30
Rohit Waghchaure
3d7f660bec
fix: test case for Project Profitability report
2021-06-20 10:20:35 +05:30
Rohit Waghchaure
f5db407461
fix: available qty for consumption
2021-06-19 23:19:45 +05:30
Rohit Waghchaure
5cc3f14506
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
2021-06-19 23:16:23 +05:30
Rohit Waghchaure
ddb0ec261a
fix: code cleanup and convert public method to private for subcontracting class
2021-06-19 23:16:23 +05:30
Rohit Waghchaure
2fb5291785
fix: toggle consumed qty field based on condition
2021-06-19 23:16:22 +05:30
Rohit Waghchaure
9a2db0b5b1
fix: semgrep error
2021-06-19 23:16:22 +05:30
Rohit Waghchaure
a94b89727c
feat: subcontract code refactor and enhancement
2021-06-19 23:16:22 +05:30
rohitwaghchaure
1c846c5be7
Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix
...
fix: time out while submitting the stock transactions with more than 50 Items
2021-06-19 18:51:47 +05:30
Rohit Waghchaure
4d81d45a0e
fix: time out while submitting the stock transactions with more than 50 items
2021-06-19 16:15:08 +05:30
rohitwaghchaure
a2bb1b8acd
Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance
...
fix: time out while submit / cancel the stock transactions with more than 50 Items
2021-06-19 16:14:14 +05:30
Rohit Waghchaure
8c844e4515
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-19 16:08:26 +05:30
GangaManoj
23876c0854
fix(Asset Repair): Prevent some fields from being copied on duplicating the doc
2021-06-19 15:23:06 +05:30
GangaManoj
012b9eaeff
fix(Asset Repair): Make Error Description non-mandatory
2021-06-19 15:18:54 +05:30
GangaManoj
7db7988e4c
fix(Asset Repair): Add Stock Entry field
2021-06-19 14:54:30 +05:30
GangaManoj
09ba6f6477
fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section
2021-06-19 14:06:45 +05:30
GangaManoj
da8da9fa4e
fix: Replace edit_dates with flags.increase_in_asset_life
2021-06-19 14:00:26 +05:30
