Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,135 Commits 3 Branches 0 Tags 1 GiB
7ff3ca25e5
Commit Graph

40135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
c1a0f649cb
fix: convert asynchronous field update to synchronous (#28930) 
(cherry picked from commit 5adf85f5b7ba94591381b03709b1fee6aa9331a5)

Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
 2021-12-17 19:06:19 +05:30
Dany Robert
b3a3367d1d feat: allow group accounts 2021-12-17 13:06:30 +00:00
Noah Jacob
b98c61f2a7 refactor: moved purpose table mandatory check to server 2021-12-17 13:47:39 +05:30
Noah Jacob
90d32006f4 fix(test): fixed test case not creating serials 2021-12-17 13:32:30 +05:30
Deepesh Garg
b139ee1777
Merge pull request #28911 from nextchamp-saqib/fix-ksa-pf 
fix(ksa): enable ksa pos invoice print format
 2021-12-17 13:04:28 +05:30
Deepesh Garg
238403d3f6
Merge pull request #28916 from deepeshgarg007/multicurrency_subscription 
fix: Multicurrency invoices using subscription
 2021-12-17 12:29:10 +05:30
Noah Jacob
450369dbae
Merge branch 'develop' into maint_sch_link_fix 2021-12-17 12:07:26 +05:30
Noah Jacob
9109660a69 test: added test for serial no. filters 2021-12-17 11:57:17 +05:30
Noah Jacob
4cb5b627a1
fix: mapping to maintenance visit gets erased (#28917) 
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit
 2021-12-16 23:06:48 +05:30
Ankush Menat
6ba8f7644d
chore: ledger invariant check report (#28921) 2021-12-16 22:31:31 +05:30
Deepesh Garg
6ab753015e fix: Add tests for multicurrency subscription 2021-12-16 17:38:29 +05:30
Deepesh Garg
0e4842b986 fix: Multicurrency invoices using subscription 2021-12-16 16:51:41 +05:30
Subin Tom
68beee2a00 fix: replaced sql query with frappe.qb 2021-12-16 13:26:21 +05:30
Saqib Ansari
564d23fa8d fix(ksa): enable ksa pos invoice print format 2021-12-16 11:19:03 +05:30
Subin Tom
9f235526d4 fix: Validation in POS for item batch no stock quantity 2021-12-15 22:34:44 +05:30
DeeMysterio
2be62c279f
feat: provision to have limited parameters for in-process quality ins… (#28549) 
* feat: provision to have limited parameters for in-process quality inspection

* chore: formatting
 2021-12-15 19:41:30 +05:30
Ankush Menat
228e011819
perf: remove forcing of posting sort index on stock balance (#28902) 
mysql is generally smart enough to figure out which index is better
based on cardinality of index. While posting sort index is better for
low item high # of SLE scenario it's bad for high item variety each with
lower count of SLEs.
 2021-12-15 19:18:41 +05:30
Saqib
6acdb2f00b
feat: Home Onboarding (#28551) 2021-12-15 18:02:54 +05:30
Noah Jacob
af2e95d192
Merge branch 'develop' into maint_sch_link_fix 2021-12-15 15:42:23 +05:30
Noah Jacob
c872aa43f8 fix(patch): updates maintenance schedule field for old docs 2021-12-15 15:27:41 +05:30
Noah Jacob
4f52b86d7e refactor: update_serial_no function and code cleanup 2021-12-15 15:24:39 +05:30
HENRY Florian
29f6852c13
feat: Manufacturing : in BOM Operation time can be fix (#27063) 
* feat: Operation time can be fixed

* better coding without duplicate code

* change modified date foir doctype

* undo change

* fix varmixing

* fix varmixing

* fix: remove f-string that's not required anymore

* refactor: use ORM instead of raw query

* fix: improve description

* test: basic test for fixed time

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-15 15:08:31 +05:30
Deepesh Garg
66f516523f
Merge pull request #28822 from ruthra-kumar/deferred_report_revenue_and_expense 
feat: Deferred Revenue and Expense report with actual and upcoming postings
 2021-12-15 15:03:11 +05:30
Jannat Patel
af202e715d
Merge branch 'develop' into home-onboarding 2021-12-15 14:28:09 +05:30
Jannat Patel
aba36eb2be Merge branch 'home-onboarding' of https://github.com/pateljannat/erpnext into home-onboarding 2021-12-15 14:26:47 +05:30
Jannat Patel
63618cc7ab fix: titles and order 2021-12-15 14:26:44 +05:30
Deepesh Garg
64f68d5e94
Merge branch 'develop' into deferred_report_revenue_and_expense 2021-12-15 14:14:34 +05:30
Subin Tom
5c4d3f89d2
feat: 'Invoice Number' field in Opening Invoice Creation Tool (#28844) 2021-12-15 14:14:16 +05:30
Subin Tom
be103ab8e6
fix: Currency fix for cost field in subscription plan (#28821) 2021-12-15 13:01:48 +05:30
Saqib
2411477e6d
fix: time to response shows failed (#28895) 2021-12-15 11:45:34 +05:30
Saqib
56bc8a52f4
Merge branch 'develop' into home-onboarding 2021-12-15 10:40:40 +05:30
Saqib
8aa9481a11
Merge branch 'develop' into so-days-taken-to-deliver 2021-12-15 10:36:47 +05:30
Saqib
39c6f661f1
revert: "fix: expected value after useful life validation" 2021-12-15 10:34:11 +05:30
Saqib Ansari
5a7a9a598b chore: rename redefinition of multiple pricing rule test 2021-12-15 10:32:23 +05:30
Saqib
5cf5412827
Merge pull request #28887 from nextchamp-saqib/sla-fixes-#1 
fix: reset_expected_response_and_resolution on hold
 2021-12-15 09:57:58 +05:30
Rucha Mahabal
a481a7c90e
fix(test): Employee Exit Summary (#28888) 2021-12-14 22:03:44 +05:30
ruthra
9ec8841b91 refactor: rename checkbox and translations 
- rename checkbox and make it
 - added translation text for labels
 - fixes for linter error
 2021-12-14 20:59:14 +05:30
Saqib Ansari
0add80b02f fix: failing tests 2021-12-14 20:24:29 +05:30
ruthra
9232f75998 refactor: change field to duration and fetch elapsed seconds 2021-12-14 19:45:09 +05:30
Ankush Menat
7c33df5d54 chore: bump coverage requirements 2021-12-14 19:41:09 +05:30
Saqib Ansari
c5fcbeff7a fix: reset_expected_response_and_resolution on hold 2021-12-14 18:45:27 +05:30
Ankush Menat
96ef88d935
test: remove commits from tests (#27939) 
* test: remove commits from tests in selling module

* test: remove commits from manufacturing module

* test: remove commits from accounts module tests

* test: remove commits from controller tests

* test: keep commits in accounting dimension test

* Revert "test: remove commits from controller tests"

This reverts commit f5cfbee5da844f8b2bffeee907ac602754f16ff4.

* Revert "test: remove commits from accounts module tests"

This reverts commit df4c27efddf355e2731a18e8871e54d18590f219.
 2021-12-14 17:36:35 +05:30
Ankush Menat
66960cf050
fix: remove set only once from valuation method (#28876) 2021-12-14 17:12:46 +05:30
Ankush Menat
80f1a8c645
fix: incorrect logic for "Reserved Qty for Production" (#28880) 
* fix: reservation for production incorrect

The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.

Solution: move the case inside Sum.

Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.

* test: use default warehouse for testing reservation
 2021-12-14 17:02:42 +05:30
Anupam Kumar
ea5e155823
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-14 16:42:59 +05:30
ruthra
a8a598ace7 refactor: remove unused function 'get_postings' 2021-12-14 16:34:51 +05:30
aaronmenezes
304aa44feb
fix: Nonstock item showing in Itemwise Recommended Reorder Level report (#28873) 2021-12-14 15:18:03 +05:30
Saqib Ansari
c0d1f4869f test: add test_multiple_pricing_rules 2021-12-14 14:58:31 +05:30
Saqib Ansari
1e17d6a607 fix: qty filter not working if apply_multiple_pricing_rules is enabled 2021-12-14 14:58:20 +05:30
Rucha Mahabal
b027050f77
Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet 
fix: incorrect amount based on payment days in timesheet salary slip
 2021-12-14 14:57:21 +05:30