18alantom
dbea840ecf
fix: re-order tour to circumvent glitchy save highlight
2021-08-25 16:34:31 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction ( #27109 )
2021-08-25 16:25:51 +05:30
Anupam
dfcac64b44
fix: review chnages
2021-08-25 16:24:46 +05:30
GangaManoj
e4c25bf4bb
fix: Return if there are no Items
2021-08-25 15:40:42 +05:30
GangaManoj
3135d6dc6a
fix: Get Bundle Items
2021-08-25 15:35:40 +05:30
GangaManoj
13ae10b3a2
fix: Remove comments
2021-08-25 15:20:27 +05:30
Chillar Anand
a65498dc61
fix(healthcare): Made payment fields mandatory for new appointments ( #26608 )
...
* fix(healthcare): Made payment fields mandatory for new appointments
* fix: sider issues
* fix: Fix failing test
* fix: Patient appointment invoicing
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2021-08-25 14:40:22 +05:30
Marica
b7ef4ce7a2
Merge pull request #27052 from 18alantom/fix-scrap-items-updation
...
fix: update scrap table item details; typo
2021-08-25 12:32:49 +05:30
Afshan
8366b6322e
fix: validate party and party type only if both available ( #27002 )
...
* fix: validate party and party type only if both available
* fix: indentation
2021-08-25 11:57:24 +05:30
Saqib
1dadea38a5
fix: remove unexpected comma ( #27132 )
2021-08-25 11:05:51 +05:30
GangaManoj
bea0f7a202
fix: Get data when grouped by invoice and otherwise
2021-08-25 02:52:18 +05:30
GangaManoj
96909b6c3b
fix: Display only the Invoice rows in bold
2021-08-25 02:49:14 +05:30
GangaManoj
b02effbc47
fix: Indentation
2021-08-25 01:00:40 +05:30
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle
2021-08-25 00:55:47 +05:30
GangaManoj
5f8c2b0946
fix: Remove base_rate and buying_rate for Invoice rows
2021-08-25 00:33:55 +05:30
GangaManoj
77352ae47e
fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled
2021-08-25 00:12:43 +05:30
GangaManoj
2dbf8075eb
fix: Calculate total buying_amount for each invoice
2021-08-25 00:09:07 +05:30
GangaManoj
3edb1938a9
fix: Fetch bundle item details
2021-08-24 23:38:24 +05:30
GangaManoj
257215f479
fix: Fetch base_net_total for each Invoice
2021-08-24 23:32:19 +05:30
GangaManoj
1956f62ad8
fix: Remove qty from Sales Invoice rows
2021-08-24 23:30:50 +05:30
Subin Tom
fbc5977248
fix: Updated timestamp for pos invoice json ( #27110 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-24 22:34:02 +05:30
GangaManoj
1d82c3effe
fix: Make Rate editable if editable_bundle_item_rates is checked
2021-08-24 22:25:59 +05:30
Dany Robert
c7bad657b1
fix: broken URL in supplier portal ( #26823 )
...
* fix: broken URL
The quotations are supplier quotations, not sales quotation.
* fix: remove erpnext from path
2021-08-24 22:10:14 +05:30
GangaManoj
a575d05a3e
fix: Make fieldname more concise
2021-08-24 22:09:36 +05:30
Anupam Kumar
1d6ef4b0d3
fix: replacing $.each -> forEach in SI ( #26995 )
...
* fix: replacing $.each -> forEach in SI
* fix: removed console log
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-24 22:06:19 +05:30
GangaManoj
2293ba302a
fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates
2021-08-24 22:04:03 +05:30
Frappe PR Bot
512ddc589f
fix: timesheet amount issue ( #25993 ) ( #26889 )
...
* fix: timesheet amount issue
* fix: timesheet detail rate conversion
* fix: condition to check timesheet currency
* fix: removing console statement
(cherry picked from commit a6aa6cd7d6
2021-08-24 22:00:32 +05:30
Deepesh Garg
c30fb04e96
fix(minor): Update GSTR-1 json version ( #27074 )
2021-08-24 21:57:25 +05:30
GangaManoj
129df6e129
fix: Update Product Bundle rate based on its updated amount
2021-08-24 21:55:54 +05:30
GangaManoj
31482a08dc
fix: Update Product Bundle price based on the rates of its child Items
2021-08-24 21:42:44 +05:30
Pruthvi Patel
7c957d72b3
perf: reduce number of queries to validate selling price ( #26225 )
...
* perf: reduce number of queries to validate selling price
* fix: improved flow and formatting
* fix: improve condition and use of `as_dict`
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-08-24 21:24:25 +05:30
Nabin Hait
b99a8cb96e
Merge pull request #27087 from deepeshgarg007/validate_due_date_fix
...
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-24 21:10:44 +05:30
Nabin Hait
f5e52549e2
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 21:07:59 +05:30
Nabin Hait
14332ad8a2
Merge pull request #27114 from frappe-pr-bot/backport/develop/24664
...
refactor: social media post fixes
2021-08-24 21:04:36 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
18alantom
95a2565d86
fix: correct value in test
2021-08-24 20:18:53 +05:30
18alantom
aff9aee29c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-24 20:15:51 +05:30
18alantom
c3ce3f918d
fix: remove spurious function 'toggle_operations'
2021-08-24 20:15:19 +05:30
Anupam Kumar
1c279af0b3
fix: lead name issue ( #26999 )
...
* fix: lead name issue
* fix: change lead name wrt first name, middle and last name
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:06:04 +05:30
Rucha Mahabal
d0cc1be230
Merge branch 'develop' into backport/develop/24664
2021-08-24 20:05:53 +05:30
Saqib
f1313302c9
fix: pos invoice test ( #27113 )
2021-08-24 19:45:21 +05:30
Marica
3167b58aee
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 19:33:09 +05:30
Anupam Kumar
164acc845a
refactor: social media post fixes ( #24664 )
...
* fix: social media post fixes
* feat: post metrics and some fixes
* fix: sider issues
* fix: sider issue
* fix: reverting optional chaning statements
* fix: sider issues
* fix: review chnages
* fix: text trigger check
* fix: sider issue
(cherry picked from commit f7e0edecc9ce45ba7baa4c17b2b35f487dffccf2)
2021-08-24 13:47:00 +00:00
18alantom
8f73d587f9
feat: process loss report, fix set pl query condition
2021-08-24 18:38:23 +05:30
GangaManoj
b4b6d10b5d
fix: Add editable Rate column
2021-08-24 17:59:11 +05:30
GangaManoj
8af5802e42
fix: Populate Bundle Items table
2021-08-24 17:58:23 +05:30
GangaManoj
91af0d6ffb
fix: Add Bundle Items table
2021-08-24 17:57:55 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report ( #27045 )
2021-08-24 17:35:01 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc
2021-08-24 17:27:43 +05:30
Saqib
f47cbae5e0
feat: allow draft pos invoices even if no stock available ( #27078 )
2021-08-24 17:27:27 +05:30
