Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO ( #25345 )
...
* fix: Dont fetch exchange rates for each line item once fetched at parent
`
* perf: Use price list conversion rate from parent
- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-19 11:05:21 +05:30
Jannat Patel
dcdd3bebbe
feat: Timer in LMS Quiz ( #24246 )
...
* feat: new fields in quiz doctypes
* feat: timer in lms quiz
* fix: variable initialisation
* fix: context, exception fix
* fix:sider
* fix:sider
* fix: indentation
* fix: timer
* fix: sider
* fix: return value and format
* fix: show time taken only after all attempts are over
* fix: sider
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-19 10:36:40 +05:30
Ankush Menat
7eac4a250d
fix: functions using mutable defaults ( #25370 )
2021-04-19 10:33:39 +05:30
Saqib
e782531529
fix: Apply single transaction threshold on net_total instead of supplier credit amount ( #25243 )
...
* fix: Apply single transaction threshold on net_total instead of supplier credit amount
* fix: Apply single transaction threshold on net_total instead of supplier credit amount
* fix: test
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-19 10:15:51 +05:30
Deepesh Garg
1e0d22a38f
Merge pull request #24805 from alyf-de/improve_taxes_setup
...
refactor: Setup Taxes and Charges
2021-04-19 09:12:47 +05:30
Raffael Meyer
9ee6e4feb8
Merge branch 'develop' into improve_taxes_setup
2021-04-18 18:34:41 +02:00
barredterra
d397bb1b74
Merge branch 'improve_taxes_setup' of https://github.com/alyf-de/erpnext into improve_taxes_setup
2021-04-18 18:34:02 +02:00
barredterra
80d44cada4
fix: remove is_default from country wise tax
2021-04-18 18:33:34 +02:00
rohitwaghchaure
4ed5d994a4
Merge pull request #25374 from ankush/shipment_status_update
...
fix: commit changes to shipment status in database
2021-04-18 17:56:22 +05:30
Ankush Menat
c28fcba779
ci(semgrep): add correctness rule for on_cancel
...
Changes done to doctype object in `on_submit` are not commited to
database. Add rule to catch similar bugs.
2021-04-18 13:22:19 +05:30
Ankush Menat
e972ceb798
fix: patch for updating shipment status
2021-04-18 13:22:19 +05:30
Ankush Menat
9229ee1745
fix: update shipment status in database
...
Caught by semgrep rule:
https://github.com/frappe/erpnext/blob/develop/.github/helper/semgrep_rules/frappe_correctness.yml#L4
2021-04-18 13:22:19 +05:30
rohitwaghchaure
72e3a81878
Merge pull request #25375 from ankush/minor_semgrep_fixes
...
fix: remove duplicate keys from dictionaries
2021-04-18 13:04:00 +05:30
Raffael Meyer
ef4c494b2b
Merge branch 'develop' into improve_taxes_setup
2021-04-17 19:38:36 +02:00
barredterra
476fff149b
Merge branch 'develop' into improve_taxes_setup
2021-04-17 18:41:31 +02:00
Ankush Menat
ad6a2657ae
chore: minor translation fixes
2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries
2021-04-17 16:56:08 +05:30
Saqib
75e13f7bb6
fix(e-invoicing): add company validation for e-invoicing ( #25348 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-17 15:38:47 +05:30
Saqib
18c7815a1b
fix: presentation currency in statement of accounts ( #25367 )
2021-04-17 15:37:40 +05:30
rohitwaghchaure
fbc0d16d8b
Merge pull request #25372 from ankush/eq_assignment_fix
...
fix: equality check instead of assignment in cart
2021-04-17 13:43:54 +05:30
rohitwaghchaure
1254af502b
Merge pull request #25362 from anupamvs/disable_rounded_total
...
feat: added Disable Rounded Total in sales transactions
2021-04-17 13:30:24 +05:30
Ankush Menat
d6be154ac2
fix: implicit string concatenation ( #25371 )
...
* fix: implicit string concatenations
* chore: rerun healthcare patch for company fields
2021-04-16 22:08:44 +05:30
Ankush Menat
67e647232c
ci(semgrep): Add semgrep testing ( #24871 )
...
Adds semgrep testing in CI.
Refer to:
- https://github.com/frappe/frappe/pull/12524
- https://github.com/frappe/frappe/pull/12577
2021-04-16 21:44:49 +05:30
Ankush Menat
adf974810d
fix: equality check instead of assignment in cart
2021-04-16 21:15:50 +05:30
Nabin Hait
eeece59a17
Merge branch 'develop' into disable_rounded_total
2021-04-16 18:44:17 +05:30
Marica
ede339f80b
fix: Serial No not updated correctly via Inter Company Stock Transfer ( #25006 )
...
* fix: Serial No not updated correctly via Inter Company Stock Transfer
* chore: Added More Test Cases for inter company Serial Transfer
* fix: Test for serial no duplication
- fixed serial no test
- made errors more meaningful on serial no validation
* fix: Stock Reco Test
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-04-16 18:42:54 +05:30
Jannat Patel
b1aad63a99
fix: leave policy in leave allocation ( #25334 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-16 16:08:22 +05:30
Anupam
9d9c256e70
feat: added Disable Rounded Total in sales transactions
2021-04-16 00:11:40 +05:30
Afshan
c0db286dc1
fix: filter for employees in salary slip ( #25360 )
2021-04-15 23:48:25 +05:30
Ankush Menat
799b3c26a4
Merge pull request #25359 from 18alantom/fix_shipment_pickup_to
...
fix: shipment pickup_to, pickup_from functionality.
2021-04-15 21:16:24 +05:30
Ankush Menat
5207edc188
Merge branch 'develop' into fix_shipment_pickup_to
2021-04-15 21:01:52 +05:30
18alantom
6179cc1311
fix: make pickup_to and pickup_from mandatory fields
2021-04-15 20:36:28 +05:30
18alantom
597bb8be18
fix: remove pickup_to, pickup_from and get_pickup_time
...
relies on server-side validation instead js controller
2021-04-15 20:32:45 +05:30
Rucha Mahabal
39b1cd827a
fix: Additional Salary component amount not getting set ( #25355 )
2021-04-15 18:54:29 +05:30
rohitwaghchaure
72929aab38
Merge pull request #24878 from anupamvs/planning
...
feat: add total available stock field in PO
2021-04-15 16:28:49 +05:30
Sun Howwrongbum
c50fbc6897
fix: list lookup with undefined variable ( #25210 )
...
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-04-15 14:52:13 +05:30
rohitwaghchaure
640b5e00ce
Merge pull request #25152 from ankush/customer_duplicates
...
fix: disable auto naming of customer during import
2021-04-15 14:46:11 +05:30
rohitwaghchaure
1bdc457777
Merge pull request #25304 from ankush/fix_sl_rounding
...
fix(stock_ledger): round off values near to zero
2021-04-15 14:44:09 +05:30
Saqib
593071bd53
fix: currency symbol in bank transaction list view ( #25336 )
2021-04-15 14:12:11 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning
2021-04-15 12:48:25 +05:30
Marica
61f5f36c65
Merge pull request #24910 from AndyOverLord/patch-8
...
fix: copy_parent_value_in_all_row function error
2021-04-14 19:04:23 +05:30
Marica
f045fde9f4
Merge branch 'develop' into patch-8
2021-04-14 18:56:15 +05:30
Marica
24e45163d5
fix: Sider
2021-04-14 18:53:15 +05:30
Ganga Manoj
c4565651ff
fix: Let Administrator delete company transactions ( #25300 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-14 17:11:36 +05:30
Saqib
d4fd1038dc
fix: pos print receipt ( #25329 )
2021-04-14 15:07:10 +05:30
Saqib
8798f30808
fix: pos print receipt ( #25328 )
2021-04-14 15:05:33 +05:30
rohitwaghchaure
ac6facda3d
Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop
...
fix: incorrect batch picked in subcontracted purchase receipt
2021-04-14 14:35:12 +05:30
rohitwaghchaure
3d9d4e03de
Merge pull request #25145 from rohitwaghchaure/fixed-incorrect-incoming-rate-for-sales-return-issue-develop
...
fix: incorrect incoming rate for the sales return
2021-04-14 14:34:46 +05:30
Nabin Hait
2535fe9b1e
fix: Resolved merge conflict
2021-04-14 13:09:50 +05:30
Nabin Hait
b77793763a
Merge branch 'version-13-pre-release' into version-13
2021-04-14 12:53:53 +05:30
