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

38395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
4b9c127494 Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre 2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3 fix: Add mandatory depends on condition for export type field 2021-08-16 14:36:50 +05:30
Deepesh Garg
9b564a7b51
Merge pull request #26955 from deepeshgarg007/export_type_mandatory 
fix: Add mandatory depends on condition for export type field
 2021-08-16 14:16:32 +05:30
Deepesh Garg
3f07bb7021 fix: Add mandatory depends on condition for export type field 2021-08-16 13:18:39 +05:30
Rucha Mahabal
67e3971c3b
fix: Org Chart fixes (#26952) 
* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting
 2021-08-16 10:38:39 +05:30
Rucha Mahabal
0b4959966c fix: expand all nodes not working when there are only 2 levels 
- added dom freeze while expanding all nodes and exporting
 2021-08-16 10:19:48 +05:30
Rucha Mahabal
4c612b7cb2 fix: add z-index to filter to avoid svg wrapper overlapping 2021-08-15 21:32:39 +05:30
Rucha Mahabal
4981746b9a
Merge branch 'develop' into org-chart-develop 2021-08-15 20:50:56 +05:30
Suraj Shetty
1514916520 fix: Nest .level class style under .hierarchy class (#26905) 
fix: Nest `.level` class style under `.hierarchy` class
 2021-08-15 20:43:16 +05:30
Deepesh Garg
7145e9d183
Merge pull request #26359 from GangaManoj/enable-discount-accounting 
feat: Enable discount accounting
 2021-08-14 18:05:29 +05:30
Frappe PR Bot
b5926a33b3
fix: unknown attribute "string_type" (#26947) (#26950) 
(cherry picked from commit 6aed9e26acaf266f7260adab16656d554c6bb022)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-14 10:48:33 +05:30
GangaManoj
f9356ee642 fix: Sider issues 2021-08-13 17:40:51 +05:30
GangaManoj
f977c65e80 fix: Make enable_discount_accounting a class property 2021-08-13 17:17:58 +05:30
GangaManoj
5999760a65 fix: Syntax error 2021-08-13 17:13:38 +05:30
Marica
f1c9766748
Merge pull request #26943 from frappe-pr-bot/backport/version-13-pre-release/26942 
fix: (Stock Analytics) Copy previous balance dict object instead of assigning
 2021-08-13 16:01:21 +05:30
Deepesh Garg
5122948450 Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting 2021-08-13 16:00:20 +05:30
Marica
2e6899fbe4 fix: Copy previous balance dict object instead of assigning (#26942) 
- Due to plain assignment, dict mutation gave wrong monthly values

(cherry picked from commit fe2a34f171)
 2021-08-13 10:08:41 +00:00
Marica
fe2a34f171
fix: Copy previous balance dict object instead of assigning (#26942) 
- Due to plain assignment, dict mutation gave wrong monthly values
 2021-08-13 15:37:45 +05:30
Ankush Menat
8a6b82b196
ci: ignore js files in unittests (#26934) 
* ci: ignore js files in unittests

- Avoid running python unittests on PRs that ONLY change JS files.

* ci: ignore md files in test workflows
 2021-08-13 12:59:27 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Afshan
587d2db6a9
fix: show proper currency symbol in taxes and charges table (#26827) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-13 10:59:06 +05:30
Afshan
1de4c01942
fix: Deferred Revenue Section should be collapsible only if its not enabled (#26928) 2021-08-12 23:06:34 +05:30
Noah Jacob
b8658d003f
fix: from_warehouse getting set to None (#26920) 2021-08-12 20:03:28 +05:30
Frappe PR Bot
f4b2f4aaf7
fix: ZeroDivisionError on creating e-invoice for credit note (#26918) 2021-08-12 17:11:38 +05:30
Saqib
88f13fef81
fix: ZeroDivisionError on creating e-invoice for credit note (#26915) 2021-08-12 16:26:51 +05:30
Ganga Manoj
54c31ed33c
feat: depreciate asset after sale (#26543) 2021-08-12 13:42:56 +05:30
Marica
b1406dba98
Merge pull request #26910 from frappe-pr-bot/backport/version-13-pre-release/26908 
fix: Stock Analytics Report must consider warehouse during calculation
 2021-08-12 10:52:20 +05:30
Marica
08e4026456 fix: Stock Analytics Report must consider warehouse during calculation (#26908) 
* fix: Stock Analytics Report must consider warehouse during calculation

* fix: Brand filter in Stock Analytics

(cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)
 2021-08-12 05:02:42 +00:00
Deepesh Garg
f037bae8ea
Merge pull request #26397 from GangaManoj/po-payment-terms 
feat: Fetch Payment Terms from linked Sales/Purchase Order
 2021-08-11 22:28:34 +05:30
Marica
63027283f3
Merge pull request #26673 from marination/stock-analytics 
fix: Stock Analytics Report must consider warehouse during calculation
 2021-08-11 19:47:56 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Marica
42899d69ea
Merge branch 'develop' into stock-analytics 2021-08-11 18:44:29 +05:30
Deepesh Garg
13fb71f642
Merge branch 'develop' into payment_entry_validations_and_trigger_develop 2021-08-11 18:20:42 +05:30
Deepesh Garg
c0b9e9c1cf
Merge pull request #26656 from ankush/fix_dn_test 
test: fix test due to rename change
 2021-08-11 18:20:17 +05:30
marination
455d300fca Revert "test: fix POS Closing Entry Test" 
This reverts commit 8f1a3aef2e.
 2021-08-11 17:00:46 +05:30
marination
867939fcae test: fixed asset movement tests 
- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces
 2021-08-11 16:40:07 +05:30
marination
8f1a3aef2e test: fix POS Closing Entry Test 
- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel
 2021-08-11 15:17:06 +05:30
Suraj Shetty
fd1c47ef77
Merge pull request #26904 from surajshetty3416/fix-list-view 2021-08-11 14:53:58 +05:30
Suraj Shetty
99658ceb4e fix: Nest .level class style under .hierarchy class 
- To avoid style overrides in list view
 2021-08-11 14:19:07 +05:30
marination
bca30d6101 test: fix Shift Request test 
- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel
 2021-08-11 13:29:44 +05:30
marination
e5b0221693 test: fix attendance request tests 
- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown
 2021-08-11 13:02:49 +05:30
Deepesh Garg
a1f0cebda5 fix: Do not update settings for test 2021-08-11 11:50:39 +05:30
Deepesh Garg
02f44528f2 test: Add test case for payment entry unlink 2021-08-11 11:50:39 +05:30
Deepesh Garg
7141860c04 test: Update exchange rate in test cases 2021-08-11 11:50:39 +05:30
Deepesh Garg
b5162390e5 fix: Only do specific validations on reference unlink 2021-08-11 11:50:39 +05:30
Deepesh Garg
188bba8feb fix: Validation for receivingfrom customer against negative outstanding 2021-08-11 11:50:39 +05:30
Deepesh Garg
c5276f3fd3 fix: Multiple fixes in payment entry 2021-08-11 11:50:16 +05:30
Deepesh Garg
a57d13e1e9 fix: Multiple fixes in payment entry 2021-08-11 11:50:16 +05:30
Afshan
976ae13c1e
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-11 11:49:27 +05:30
Ankush
c1c9c4b68e
Merge branch 'develop' into fix_dn_test 2021-08-11 11:40:15 +05:30