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

2597 Commits

Author SHA1 Message Date
Deepesh Garg
9c49f2d886
feat: Enhancement in subscription (#22263) 
* feat: Add supplier in subscription doctype

* fix: Code cleanup

* fix: Add dynamic link in subscription invoices

* fix: Multiple enhanccement in subscription

* feat: Follow calendar months in subscription

* fix: Test Cases and patch

* fix: Patch

* fix: Update patch and add fixes

* fix: Update permission for subscription settings

* fix: Patch and Test

* fix: Add cost center dimension in Subscripiton
 2020-07-23 11:11:23 +05:30
Marica
2ee64ceaff
Merge branch 'develop' into club-mr-column 2020-07-22 18:52:10 +05:30
Deepesh Garg
7c50f421e1
fix: Move branch code back to bank account (#22725) 
* fix: Move branch code back to bank account

* fix: Patch
 2020-07-22 18:21:04 +05:30
sahil28297
3d3c922d7f
fix(patch): handle duplicate entry error while inserting account (#22745) 2020-07-22 16:42:31 +05:30
Afshan
6b9acf4476 updated patch to delete auto email reports and moved patch to v13 from v12 2020-07-22 16:00:18 +05:30
Marica
8ec4198af2
Merge branch 'develop' into club-mr-column 2020-07-20 16:07:10 +05:30
Rohit Waghchaure
07cc918d70 fix: patch update_actual_start_and_end_date_in_wo 2020-07-15 16:41:32 +05:30
Afshan
e9affe3705 merge branch develop 2020-07-10 16:31:40 +05:30
Afshan
0863beec92 created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport" 2020-07-10 15:14:01 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
Deepesh Garg
be05c4e14a fix: Codacy and minor fixes 2020-07-05 18:16:16 +05:30
mohammadahmad1990
f933cf80df Patch for Updating item Tax Template Company 2020-07-03 15:04:37 +05:00
Deepesh Garg
50e6e47e66 fix: Patch 2020-06-28 21:32:08 +05:30
Deepesh Garg
eca2c1cd93 fix: patch 2020-06-28 18:53:55 +05:30
vishdha
d3ec1c1d89 feat: Taxjar Integration Added 2020-06-24 16:37:21 +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
Anurag Mishra
8ffb9f852f
fix: patch check_is_income_tax_component (#22371) 2020-06-22 12:17:29 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +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
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
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Rucha Mahabal
428235c478
fix: revert issue metrics patch (#22331) 2020-06-19 11:15:59 +05:30
rohitwaghchaure
853fce8c7e
Merge branch 'develop' into rfq-multi-uom 2020-06-18 15:49:53 +05:30
Rucha Mahabal
a529d71ca0
fix(patch): add patch for setting issue metrics (#22296) 
* patch: set issue metrics in Issue documents

* fix: commit after every 100 records
 2020-06-18 15:38:43 +05:30
Marica
d6906dccfe
Merge branch 'develop' into rfq-multi-uom 2020-06-18 14:44:46 +05:30
marination
95e9a4ef2c fix: Patch simplification 
- Also, apply patch to all docs
 2020-06-18 14:46:42 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-17 10:53:13 +05:30
Rohit Waghchaure
fa6e4f62e2 fix: travis for develop 2020-06-16 12:02:58 +05:30
marination
87dafb4d70 Merge branch 'develop' of https://github.com/frappe/erpnext into rfq-multi-uom 2020-06-15 17:44:04 +05:30
marination
ae862c993b feat: Multi UOM support in Request for Quotation 2020-06-15 17:38:47 +05:30
Rucha Mahabal
096792791b fix(patch): reload child tables 2020-06-15 14:07:06 +05:30
Rucha Mahabal
bf26b10df4
Merge branch 'develop' into sla-enhancements 2020-06-15 13:15:03 +05:30
Sahil Khan
182c1f860b fix(patch): escape special characters in company field 2020-06-12 15:16:20 +05:30
Abhishek Balam
86ea75e49e
fix(HR): Change Due Advance Amount to Pending Amount (#22123) 
* rename 'Due Advance Amount' field to 'Pending Amount'

* changed fieldname and references for easier debugging

* added patch for moving data

* added newline added

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-12 13:13:14 +05:30
Rucha Mahabal
d7481f59ba fix: patch 2020-06-11 17:41:05 +05:30
Rucha Mahabal
5b6d2c2e7b
Merge branch 'develop' into sla-enhancements 2020-06-10 12:33:19 +05:30
Rucha Mahabal
73326d308b refactor: move pause SLA configuration to SLA DocType 2020-06-05 18:23:39 +05:30
Rucha Mahabal
25ef6a9638 fix: add default hold statuses in fixtures and patch 2020-06-05 16:37:20 +05:30
Rucha Mahabal
3f08350181 fix: retain Hold status 2020-06-04 15:56:59 +05:30
Rucha Mahabal
b3338a149b fix: code clean-up 2020-06-04 12:35:00 +05:30
Nabin Hait
2186c223b9
fix: Migrate standard_tax_exemption_amount if field exists (#22036) 2020-05-29 21:26:49 +05:30
Deepesh Garg
dfa32a77c1 fix: Patch to remove Property Setter 2020-05-29 17:20:33 +05:30
Chinmay D. Pai
d6587fa1d5
fix: check if swift_number exists in bank account 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-05-29 12:44:09 +05:30
Rucha Mahabal
43d4397003
Merge branch 'develop' into sla-enhancements 2020-05-29 11:43:49 +05:30
Rucha Mahabal
bc38289a59 fix: added patch for sla enhancements 2020-05-29 11:43:05 +05:30
sahil28297
9209b9a7de
fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016) 2020-05-28 18:49:47 +05:30
sahil28297
517ab955ac
fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013) 2020-05-28 18:32:16 +05:30
Marica
1a25aa83de
fix: Delete Auto Email Reports (#22009) 2020-05-28 18:16:24 +05:30
marination
29d7a7ea05 fix: Added permission via regional setup and patch 2020-05-27 22:14:36 +05:30