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

31853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barredterra
3efe0d0e83 refactor: query meta data only once 
(cherry picked from commit 55c048f56c)
 2020-06-28 11:29:47 +00:00
barredterra
cf53305abb fix(report view): explicitly set column width for 
(cherry picked from commit 7a7add5001)
 2020-06-28 11:29:47 +00:00
rohitwaghchaure
69aa2e400a
Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223 
feat: Accounting entries for service item in Purchase receipt (bp #22223)
 2020-06-28 11:26:21 +05:30
mergify[bot]
fce39f706d
fix: Send email to credit controllers to increase credit limit (#22473) 
(cherry picked from commit 0ff5af222a)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-26 16:21:56 +05:30
Deepesh Garg
4c726b25ee
fix: Add view ledger button for cancelled docs (#22433) 
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
 2020-06-25 15:37:04 +05:30
Deepesh Garg
8d8ce63be7
Merge pull request #22425 from deepeshgarg007/update_jv_account_timestamp_v13 
fix: Update journal entry account timestamp
 2020-06-24 18:48:36 +05:30
Deepesh Garg
be9a8e1a14 Resolve merge conflicts 2020-06-24 18:47:58 +05:30
Deepesh Garg
faa0c5624e fix: Update journal entry account timestamp 2020-06-24 18:45:16 +05:30
Deepesh Garg
51ce1e1d4e fix: Test Cases 
(cherry picked from commit ded3ab1cd7)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
12f1f8e111 fix: Move check from Stock Settings to Company Master 
(cherry picked from commit 53d5d16abb)
 2020-06-24 05:38:33 +00:00
Deepesh Garg
6e2ca779c5 feat: Accounting entries for service item in Purchase receipt 
(cherry picked from commit c258ac82c5)
 2020-06-24 05:38:32 +00:00
Nabin Hait
b90194970d fix: Merge conflict 2020-06-23 20:01:24 +05:30
Marica
7af7bb8311
fix: Insert Supplier Group via List View (#22403) 2020-06-23 17:51:02 +05:30
Rohan
9c25101d9b
feat: add ability for a contract to be authorised internally (#22095) 
* Added ability for a contract to be signed by a company user before being sent out

* feat: contract signed by stays even after reload (#402)

* format: use new JSON format

Co-authored-by: Neil Lasrado <neil@digithinkit.com>
Co-authored-by: nehasacher143 <45919049+nehasacher143@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-23 17:39:37 +05:30
Anurag Mishra
ecbfda7d6a
fix: typo in template(#22401) 2020-06-23 14:33:49 +05:30
Anoop
5e16ca0326
fix: Login page doesn't load for new sites (#22388) 
* fix: Login page doesn't load for new sites

Login page broken as active domains are not set for new sites

* Update footer_powered.html

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-23 11:11:13 +05:30
Anurag Mishra
101d15f2f8
fix: not working without from_amount and percentage_deduction (#22380) 2020-06-23 10:45:54 +05:30
Anurag Mishra
36560c8406
fix: staffing Plan validation (#22379) 2020-06-23 10:44:33 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract (#22386) 
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-06-23 10:42:32 +05:30
Marica
3dee5273d6
fix: Update Packed Items via Update Items in SO (#22392) 2020-06-23 10:33:47 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item (#22393) 2020-06-23 10:32:51 +05:30
Deepesh Garg
7cc1cf36ca
feat: More controlled deferred revenue booking (#21671) 
* feat: More controller deferred revenue booking

* fix: Query for last gl entry

* fix: Accounting Dimension for Deferred entries

* fix: Deferred revenue booking against paid invoices

* fix: Don not update outstanding on Deferred Entry submission

* fix: Naming fixes

* feat: Deferred revenue/expense booking based on months

* fix: Test case for fix monthly deferred revenue booking

* fix: Typo

* fix: Patch to update settings

* fix: Test case to book deferred expense via journal entry

* fix: Update field for better UX

* fix: Codacy

* fix: Change select field to checkbox
 2020-06-23 09:57:56 +05:30
Deepesh Garg
3c25308b27
Merge pull request #21997 from totolouis/patch-1 
fix: translation from HTML code to apostrophe
 2020-06-22 21:43:38 +05:30
Suraj Shetty
c753502412
Merge branch 'develop' into patch-1 2020-06-22 21:41:31 +05:30
rohitwaghchaure
b658a010f1
Merge pull request #22383 from frappe/mergify/bp/develop/pr-22330 
fix(pricing_rule): apply_on logic dont get cleanup (bp #22330)
 2020-06-22 21:08:55 +05:30
Deepesh Garg
49f51f4132
Merge pull request #22346 from AfshanKhan/ISS_20_21_02455 
fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total
 2020-06-22 20:53:23 +05:30
Rohit Waghchaure
aaed3b988f added validation and clear fields for Apply Rule On Other 
(cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)
 2020-06-22 14:52:30 +00:00
Poranut Chollavorn
e3973a4730 fix(pricing_rule): apply_on logic dont get cleanup 
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
 2020-06-22 14:52:29 +00:00
Deepesh Garg
5dc175f068
fix(Immutable Ledger): Item wise backdated stock entry posting (#22366) 
* fix(Immutable Ledger): Item wise backdated stock entry posting

* fix: Remove fiscal year query

* fix: Update message string
 2020-06-22 19:05:39 +05:30
Deepesh Garg
c914d1b8e8
Merge branch 'develop' into ISS_20_21_02455 2020-06-22 18:46:58 +05:30
Anupam Kumar
71da90034d
fix: resetting lost reason in opportunity and quotation (#22378) 2020-06-22 18:27:14 +05:30
Deepesh Garg
be4fc1a78e
fix(UX): Notify user of expense account change in Purchase Invoice (#22193) 2020-06-22 18:03:11 +05:30
Anurag Mishra
7672166ce3
fix: Wrong filter (#22375) 2020-06-22 17:22:05 +05:30
Anurag Mishra
0093b3b27c
fix: label (#22377) 2020-06-22 17:21:01 +05:30
Deepesh Garg
0252cb6789
Merge pull request #22374 from deepeshgarg007/employee_advance_cancel 
fix: Unable to cancel employee advance
 2020-06-22 14:55:21 +05:30
Deepesh Garg
62897d3878 fix: Unable to cancel employee advance 2020-06-22 14:54:01 +05:30
Anurag Mishra
8ffb9f852f
fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
rohitwaghchaure
39a7516252
Merge pull request #22241 from deepeshgarg007/cost_center_fix 
fix: Minor fixes in cost center
 2020-06-22 11:21:14 +05:30
Alvaro
43be163b32
feat: Enabled translation on html files in LMS [Proposal] (#21582) 
* :fix:  translation fix for html files in LMS

* fix: typo in translation

* Update content.html

* Update content.html

* Update profile.html

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-22 11:06:12 +05:30
Deepesh Garg
7f94765d02
Merge pull request #22350 from AfshanKhan/ISS_20_21_02392 
fix: Skipping total row for tree-view reports
 2020-06-21 19:25:59 +05:30
Afshan
84c6973742 fix: adding json for checked add total row 2020-06-21 17:48:44 +05:30
Deepesh Garg
95a497cffb Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix 2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981 fix: Test 2020-06-20 12:32:30 +05:30
Deepesh Garg
dee1c92df1
Merge pull request #22351 from kennethsequeira/purchase_inv_due 
fix: status error in purchase invoice
 2020-06-20 11:58:19 +05:30
Revant Nandgaonkar
d39c97e281
fix: trigger docker build on release (#22353) 2020-06-19 23:56:53 +05:30
Afshan
3fbe6e9e4b fix: test case 2020-06-19 22:51:52 +05:30
Kenneth Sequeira
b7c8037e9a fix codacy 2020-06-19 22:33:51 +05:30
Kenneth Sequeira
b4c3e2243e Merge branch 'purchase_inv_due' of https://github.com/kennethsequeira/erpnext into purchase_inv_due 
merge
 2020-06-19 22:30:23 +05:30
Kenneth Sequeira
802c300218 Revert "fix: rogue s/codacy" 
This reverts commit 2bf8d60d7e.
 2020-06-19 22:29:55 +05:30
Kenneth Sequeira
2bf8d60d7e fix: rogue s/codacy 2020-06-19 22:25:55 +05:30