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

38449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 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
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
Marica
236f35d2fa
Merge pull request #27098 from surajshetty3416/fix-remove-all-import 
fix: Use remove_all from file_manager
 2021-08-24 15:56:31 +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
Suraj Shetty
1e05c9467b fix: Use remove_all from file_manager 2021-08-24 14:21:14 +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
dd3372a3a5
Merge pull request #27089 from frappe/revert-26604-salary-component-account-filter 
Revert "fix: Salary component account filter"
 2021-08-24 08:34:21 +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