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

22778 Commits

Author SHA1 Message Date
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
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
Anurag Mishra
289c82243f
feat: New Payroll module (#21990) 
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
 2020-06-19 19:17:57 +05:30
Marica
47a4567301
Merge branch 'develop' into purchase_inv_due 2020-06-19 18:44:53 +05:30
Kenneth Sequeira
02f3e045ab fix: due date filter in purchase invoice 2020-06-19 18:22:04 +05:30
Afshan
65f00cea15 fix: Skipping* 2020-06-19 18:19:06 +05:30
Afshan
fbd66574ad Skiping total row for tree-view reports 2020-06-19 18:17:01 +05:30
Deepesh Garg
aea450c36a
Revert "fix: update remark on submitting payment entry" 2020-06-19 17:29:49 +05:30
Afshan
aca2ca5982 style: formate according to Codacy/PR Quality Review 2020-06-19 16:22:41 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055) 
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-19 15:33:21 +05:30
Afshan
0fe14ce94e style: formate according to Codacy/PR Quality Review 2020-06-19 15:10:15 +05:30
Afshan
6f7652f425 fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total 2020-06-19 14:36:56 +05:30
Afshan
7a45c8bc28 fix: replaced "row_id" to "idx" as "row_id" was not available in variable "tax", also replaced "-1" by "-2" as "idx" starts with 0 rather than 1 2020-06-19 12:37:50 +05:30
Deepesh Garg
163a569715 chore: Delete Bank Reco doctype 2020-06-19 12:03:36 +05:30
Deepesh Garg
23cb5e1869
Merge pull request #22312 from frappe/email-digest-html 
fix: Email digest html view fix
 2020-06-19 11:36:02 +05:30
Rucha Mahabal
428235c478
fix: revert issue metrics patch (#22331) 2020-06-19 11:15:59 +05:30
Afshan
a9cdc7b696
style: moved project from reference section to accounting dimensions section (#22309) 2020-06-19 11:11:33 +05:30
rohitwaghchaure
a504bdb448
Merge pull request #22329 from scmmishra/fix-grammar-footer 
refactor: show service instead of services
 2020-06-19 10:59:52 +05:30
rohitwaghchaure
ec2dec03cc
Merge pull request #22334 from kennethsequeira/item-sale-hist 
fix: Customer Group label in Item-wise Sales History report
 2020-06-19 10:53:09 +05:30
Kenneth Sequeira
766f978858 fix: Customer Group label in Itemwise Sales report 2020-06-18 23:23:54 +05:30
rohitwaghchaure
9d25826bbe
Merge pull request #22249 from marination/rfq-multi-uom 
feat: Multi UOM support in Request for Quotation
 2020-06-18 20:48:13 +05:30
Shivam Mishra
e892448733
Merge branch 'develop' into fix-grammar-footer 2020-06-18 14:21:03 +00:00
Shivam Mishra
25702a1c55 refactor: show service instead of services 2020-06-18 19:49:46 +05:30
Anurag Mishra
d9b2d635d8
feat: added Expense approver for employee and validation (#22244) 
* feat: added Expense approver for employee nad validation

* fix: requested changes
 2020-06-18 19:13:01 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year (#21880) 
* feat: date filter for fiscal year

* fix: rename fieldtypes to valid_for_fieldtypes

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-18 18:18:41 +05:30
Anupam Kumar
77673e27e0
enable Lead create by email (#22314) 
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-18 17:46:20 +05:30
Deepesh Garg
bdb40553c3
Merge pull request #22323 from deepeshgarg007/item_tax_map 
fix: Do not copy Item Tax template from SO to PO
 2020-06-18 17:01:53 +05:30
Deepesh Garg
1ba7708b60 fix: Do not copy Item Tax template from SO to PO 2020-06-18 16:45:16 +05:30
rohitwaghchaure
b5af614824
Merge pull request #22219 from Anurag810/quality_procedure_fix 
fix: Child is shown in Parent process if added from tree view
 2020-06-18 15:51:00 +05:30