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

33443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
db3fa4e6b2 fix: Place of Supply fix in Sales Invoices 2020-10-30 19:19:48 +05:30
marination
97d38548aa chore: Purchase Invoice Get Items From cleanup 2020-10-30 17:50:25 +05:30
marination
66b2b544f8 chore: Purchase Receipt, added required by date in PO popup 2020-10-30 17:45:28 +05:30
marination
08e5031be2 chore: Supplier Quotation Get Items From cleanup 2020-10-30 17:36:20 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From' 
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
 2020-10-30 17:06:00 +05:30
rohitwaghchaure
c451c08824
Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop 
fix: po_detail field has no value for subcontracted stock entry
 2020-10-30 16:48:11 +05:30
rohitwaghchaure
ce7f9dffa9
Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving 
fix: patch to update reason for leaving in employee
 2020-10-30 16:47:48 +05:30
Rohit Waghchaure
e1781dc0bb fix: patch to update reason for leaving in employee 2020-10-30 15:34:04 +05:30
Saqib
32442008dc
fix: asset finance book posting date fix (#23778) 2020-10-30 15:30:18 +05:30
Rohit Waghchaure
71913c36a7 fix: po_detail field has no value for subcontracted stock entry 2020-10-30 14:35:16 +05:30
rohitwaghchaure
2160050c82
Merge pull request #23728 from marination/prod-plan-status 
feat: Close Production Plan
 2020-10-30 14:23:25 +05:30
marination
6bf507a54b chore: (MR)Added delivery date in SO dialog 2020-10-30 13:59:47 +05:30
Marica
b05318aa51
Merge branch 'develop' into prod-plan-status 2020-10-30 12:33:27 +05:30
Mohammad Hasnain Mohsin Rajan
30197d7fba
Merge branch 'develop' into UAE-VAT-Format 2020-10-30 10:29:56 +05:30
rohitwaghchaure
707788da4b
Merge pull request #22711 from rohitwaghchaure/multiple-pricing-rules-are-not-applied 
fix: multiple pricing rules are not working on selling side
 2020-10-30 02:42:51 +05:30
Marica
9dc4941072
Merge branch 'develop' into prod-plan-status 2020-10-30 00:53:10 +05:30
François de Ryckel
ca5f5cb367
Update student_attendance.py (#23761) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-10-29 23:04:13 +05:30
Rucha Mahabal
9db26155ad
fix: set SLA variance in seconds for Duration fieldtype (#23765) 
* fix: calculate SLA variance in seconds for Duration fieldtype

* fix: sider
 2020-10-29 22:39:21 +05:30
rohitwaghchaure
445d23223b
Merge branch 'develop' into multiple-pricing-rules-are-not-applied 2020-10-29 22:25:19 +05:30
Anupam Kumar
e43f8f12d5
Merge branch 'develop' into project-timesheet 2020-10-29 22:03:31 +05:30
Anupam
9002904131 feat: added project link in timesheet form 2020-10-29 21:36:31 +05:30
Deepesh Garg
9c67629e28
fix: Ignore cancelled entries instock balance report (#23757) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-29 19:51:57 +05:30
Nabin Hait
b7285fdcad
Merge branch 'develop' into prod-plan-status 2020-10-29 18:58:32 +05:30
Nabin Hait
2bb110b3d1
Merge branch 'develop' into fix-po-no-fetching 2020-10-29 18:57:33 +05:30
Marica
8f6bd851d3
chore: Show Toast alert feedback on Scanning Barcode (#23760) 2020-10-29 18:55:52 +05:30
Marica
bf54ea9976
chore: (Production Plan) Simplify and fix translation in message popup (#23753) 2020-10-29 18:54:36 +05:30
rohitwaghchaure
d0c2700c85
fix: subscription test case (#23763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-29 18:52:16 +05:30
Saqib
b193731158
fix: pos profile has no attr 'show_only_available_items' (#23758) 2020-10-29 13:23:50 +05:30
Marica
1b8a1cfed2
Merge branch 'develop' into prod-plan-status 2020-10-29 13:02:19 +05:30
Mohammad Hasnain Mohsin Rajan
55c78b17ba
fix(UAE VAT 201): change desk page record 2020-10-29 12:43:43 +05:30
Kenneth Sequeira
10f2468076
fix: make asset dashboard charts public (#23751) 2020-10-29 12:02:48 +05:30
Syed Mujeer Hashmi
c17cdd7c2e
fix: Fix for LMS Sign Up link (#23743) 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-10-29 11:10:06 +05:30
Mohammad Hasnain
eb3084b072 refactor(UAE VAT 201): break functions 2020-10-29 09:52:17 +05:30
Mohammad Hasnain
bf261a6c39 fix(UAE VAT 201): fix helper 2020-10-29 00:07:52 +05:30
Mohammad Hasnain
08846f6b11 refactor(UAE VAT 201): replace cartesian product to inner joins 2020-10-28 23:33:56 +05:30
Mohammad Hasnain
2c00549dfe refactor(UAE VAT 201): Use frappe api instead sql 2020-10-28 22:54:56 +05:30
Deepesh Garg
ae6a51b83a
Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix 
fix: Do not allow Company as accounting dimension
 2020-10-28 22:05:11 +05:30
Mohammad Hasnain Mohsin Rajan
6e9e6d2491
Merge branch 'develop' into UAE-VAT-Format 2020-10-28 21:06:11 +05:30
Rohit Waghchaure
0fa741b267 added test cases 2020-10-28 17:43:36 +05:30
Deepesh Garg
94a630c255 fix: Do not allow Company as accounting dimension 2020-10-28 17:15:14 +05:30
Saqib
a51d9e3259
fix: pos register shows cancelled documents (#23747) 2020-10-28 17:08:47 +05:30
Saqib
7d9dd3c628
fix: item wise tax calculation (#23744) 2020-10-28 17:07:10 +05:30
Rohit Waghchaure
a248dfb9a5 fix: multiple pricing rules are not working on selling side 2020-10-28 16:22:49 +05:30
Deepesh Garg
c9a6135d6c fix: Interest accrual after loan topup 2020-10-28 13:38:15 +05:30
Rushabh Mehta
1dd54e457d
Merge pull request #23734 from rmehta/quality-form-cleanup 
fix(cleanup): Quality Module, cleanup of forms, dashboards etc.
 2020-10-28 11:36:00 +05:30
Mohammad Hasnain
81f2efd9b0 chore(UAE VAT 201): Rename emirate to vat emirate 2020-10-28 10:28:25 +05:30
Marica
4326d21a79
Merge branch 'develop' into purchase-invoice-payment-terms 2020-10-27 18:40:20 +05:30
Rushabh Mehta
12a2e51e20 fix(minor): translation string encoding in quality_procedure.py 2020-10-27 18:38:44 +05:30
Rushabh Mehta
cf1428904a fix(refactor): refactor tests, client side code 2020-10-27 17:36:30 +05:30
marination
67f2c82d90 chore: Test case for Payment Terms in PI from PR 2020-10-27 14:49:43 +05:30