Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,443 Commits 3 Branches 0 Tags 1 GiB
f1b77360ee
Commit Graph

28914 Commits

Author SHA1 Message Date
Deepesh Garg
c30fb04e96
fix(minor): Update GSTR-1 json version (#27074) 2021-08-24 21:57:25 +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
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
Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books (#26921) 2021-08-24 17:26:23 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si (#27097) 2021-08-24 17:24:41 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields (#27091) 2021-08-24 17:23:14 +05:30
Marica
774f305713
Merge branch 'develop' into update-stock-onboarding-fp 2021-08-24 16:23:42 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice (#27004) 2021-08-24 16:22:46 +05:30
18alantom
b58853e89d feat: add procss_loss_qty field in work order 2021-08-24 16:11:29 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test (#27099) 
* fix: pos closing entry cancellation test

* fix: invalid imports

* fix: sider issue
 2021-08-24 15:37:00 +05:30
Saqib
6cf9254ee5
fix: invalid imports (#27101) 2021-08-24 15:26:44 +05:30
18alantom
7fb08173b5 fix: reword error messages, fix test values 2021-08-24 15:01:38 +05:30
18alantom
ad735522cb fix: rename form tours to doctype names, remove tours from js controllers 2021-08-24 14:54:38 +05:30
Marica
b9130bf4db
Merge branch 'develop' into fix-scrap-items-updation 2021-08-24 12:54:38 +05:30
Ankush Menat
c09d8a2809
fix(ux): keep stock entry title & purpose in sync (#27043) 
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-08-24 12:20:34 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items (#27021) 2021-08-24 12:18:40 +05:30
Ankush Menat
0dff0beaba
fix: stock analytics report date range issues and add company filter (#27014) 
* test: tests for correct get_period_date_ranges

* fix: stock analytics report date range issues

- Upon selecting second half of month with Monthly filter, data from
  that period was missing.
- Solution: "round down" the date as per expected frequency.

* chore: drop py2 and fix misleading docstring

* test: fix test to avoid FY clash

* feat: add company filter in stock analytics report

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-24 12:16:46 +05:30
rohitwaghchaure
6106a635f8
Merge branch 'develop' into fix-scrap-items-updation 2021-08-24 12:10:04 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on instead of code (#27008) 2021-08-24 12:07:38 +05:30
rohitwaghchaure
db385261f0
Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom 
fix: stock ledger report not working if include UOM selected in filter
 2021-08-24 10:16:35 +05:30
rohitwaghchaure
95866b736e
Merge pull request #27081 from rohitwaghchaure/fixed-donot-overrride-batch-no 
fix: batch no reset on changing of qty
 2021-08-24 10:15:36 +05:30
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom 2021-08-24 08:50:49 +05:30
Rushabh Mehta
49e0a4f287 Revert "fix: Salary component account filter (#26604)" 
This reverts commit ae9d1d9617.
 2021-08-24 08:33:57 +05:30
Deepesh Garg
bd709f8ab0 fix: Ignore due date validations if payment terms are copied from orders/receipts 2021-08-23 19:05:52 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no 2021-08-23 18:07:22 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop 
fix: Multiple fixes in payment entry
 2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 (#27083) 2021-08-23 15:38:26 +05:30
Rohit Waghchaure
e1f070437a fix: selected batch no changed on updation of qty 2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4 fix: stock ledger report not working if include uom selected in filter 2021-08-23 13:36:13 +05:30
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 (#27044) 2021-08-23 11:17:31 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue (#26872) 2021-08-23 11:05:07 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop 2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary (#27069) 2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values (#26975) 2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc 2021-08-20 20:42:50 +05:30
Saqib
ec258551bf
fix: flaky test for SLA (#27051) 2021-08-20 19:09:31 +05:30
Alan
62c590261c
refactor: rectify typo (#27057) 
[skip ci]
 2021-08-20 18:21:09 +05:30
18alantom
810bce8da2 Merge branch 'develop' into update-stock-onboarding-fp 2021-08-20 16:31:27 +05:30
18alantom
f4487c3ae5 refactor: use Form Tour doc instead of controller form tour 
note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings
 2021-08-20 16:25:20 +05:30
18alantom
77ebbdd172 fix: minor changes 
- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight
 2021-08-20 16:21:33 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company (#26923) 
* fix: Cascade deletion for Company
 2021-08-20 14:40:12 +05:30
18alantom
6ef16ee4fb fix: update scrap table item details; typo 2021-08-20 12:24:13 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Nabin Hait
b8c998119b
Merge pull request #27040 from marination/cart-pl-exchange-rate 
fix: Shopping cart Exchange rate validation
 2021-08-20 10:56:10 +05:30
Nabin Hait
12d7f83998
Merge pull request #27033 from noahjacob/ux_promo_scheme_fix 
fix(ux): removed rate from grid view
 2021-08-20 10:51:59 +05:30
Nabin Hait
657e61ae6d
Merge pull request #27028 from noahjacob/prompt_warehouse_fix 
fix: incorrect mandatory error message for warehouse
 2021-08-20 10:48:34 +05:30
marination
8046d15ef0 chore: Comment out obsolete test 
- Modifying this test means considering extreme edge cases, which seems pointless now
 2021-08-19 21:10:30 +05:30
Noah Jacob
f13315809e
refactor: renamed varint_item_code to variant_item_code (#27025) 2021-08-19 20:28:30 +05:30
marination
45617ae22f fix: Shopping cart Exchange rate validation 
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
 2021-08-19 20:01:05 +05:30
Alan
9225f02599
fix: pass planned start date to created work order (#27031) 
* fix: pass planned start date to created workorder

* test: production plan to work order start date

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-19 18:49:20 +05:30
Saqib Ansari
8e79c48db8 fix: remove unwanted filter query 2021-08-19 18:10:02 +05:30
Saqib Ansari
71e7254184 test: creation of advance entry on invoice submission 2021-08-19 18:09:35 +05:30
Saqib Ansari
977b09b6ba feat: auto create advance entry on invoice submission 2021-08-19 18:09:35 +05:30
Saqib Ansari
cad08bc428 feat: toggle to enable common party accounting 2021-08-19 18:09:35 +05:30
Saqib Ansari
dddc29fdc1 feat: initialize party link for customer & suppliers 2021-08-19 18:09:35 +05:30
Afshan
c60d5523bc
fix: add child item groups into the filters (#26997) 
* fix: add child item groups into the filters

* fix: appending values to proper variable

* fix: refactor the loop
 2021-08-19 16:23:18 +05:30
Noah Jacob
6541453c16 fix(ux): removed rate from grid view 2021-08-19 15:53:55 +05:30
Alan
09f34e558e
fix: set production plan to completed even on over production (#27027) 2021-08-19 15:51:36 +05:30
Ankush Menat
993b0532f8
Merge pull request #27026 from ankush/eq_assign 
fix: equality check instead of assignment


[skip ci]
 2021-08-19 15:43:34 +05:30
Noah Jacob
cf8d2d97dd fix: Incorrect mandatory error message for warehouse 2021-08-19 15:43:20 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Deepesh Garg
869e36c33a
Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix 
fix: Payment Reconciliation party validation issue
 2021-08-19 12:40:54 +05:30
Afshan
ecd6584c50
fix: assigning values to rows in sales register reports (#26546) 
* fix: assigning values to rows in sales register reports

* fix: check for is_internal_customer for unrealized_profit_loss_account
 2021-08-19 12:18:27 +05:30
Frappe PR Bot
44434ff70f
fix: date_unchanged calculation in "Update Items" (#26992) (#27011) 
Branch corrected https://github.com/frappe/erpnext/pull/26058

  ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
  "date_unchanged" variable gets false value because of new_date is string.

  "getdate(new_date)" corrects the date comparison.

  ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)

(cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
 2021-08-18 18:33:06 +05:30
Subin Tom
ef792971f3
fix: Add ignore user perms to set_target_warehouse field in sales invoice (#26987) 
* reverting ot v12.7.1

* fix: Ignore user permissions for set_target_warehouse in SI

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 18:20:04 +05:30
Afshan
dc7280eef0
fix: filtering of items in Sales and Purchase Orders (#26936) 
* fix: filtering of items in Sales and Purchase Orders

* fix: slider

* fix: slider
 2021-08-18 17:44:40 +05:30
Afshan
87372c8ce4
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:20:36 +05:30
Subin Tom
333e44eb47
fix: Dimension filter query fix to avoid including disabled dimensions (#26988) 
* reverting ot v12.7.1

* fix: Dimension filter query fix to not display disabled dimensions

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 16:17:54 +05:30
Afshan
2416b3a1ee
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:03:47 +05:30
Marica
112fc888f1
fix: Return Qty in PR/DN for legacy data (#27001) 2021-08-18 15:29:48 +05:30
Saqib
cab49254fc
fix: failing tests in issue doctype (#26998) 2021-08-18 14:53:32 +05:30
Saqib
fbc163cea6
feat: dynamic conditions for applying SLA (#26662) 2021-08-18 11:53:26 +05:30
Rucha Mahabal
15df0ad6a0
fix: undefined variable due to inconsistent porting of commits (#26994) 2021-08-18 11:23:44 +05:30
rohitwaghchaure
c068e8128c
Merge pull request #26993 from rohitwaghchaure/fixed-sales-invoice-not-loading 
fix: sales invoice not loading issue
 2021-08-18 10:32:54 +05:30
Rohit Waghchaure
e0862de863 fix: sales invoice not loading issue 2021-08-18 10:27:58 +05:30
Afshan
5fec44446e
fix: set account for change amount even if pos profile not found (#26986) 2021-08-17 20:06:19 +05:30
Deepesh Garg
93fc469ace
Merge pull request #26973 from deepeshgarg007/payment_entry_unallocated_fix 
fix: Incorrect unallocated amount calculation in payment entry
 2021-08-17 19:13:58 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
18alantom
cc177f3415 fix: wo tests, sider, account for pl in se validation 2021-08-17 16:49:00 +05:30
18alantom
2670adc0c0 test: check manufacture completion qty in se and wo 2021-08-17 16:40:44 +05:30
18alantom
ad73d3fbfb refactor: validation error message formatting 2021-08-17 16:40:16 +05:30
18alantom
23ef51a981 fix: sider 2021-08-17 16:40:05 +05:30
18alantom
47a4a3d888 refactor: polyfill ?? 2021-08-17 16:39:05 +05:30
Deepesh Garg
fd739749ba test: Add test case for payment entry 2021-08-17 16:38:25 +05:30