CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-10 13:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,955 Commits 410 Branches 1,715 Tags
e1b96d70db5bd652a5ba1d2a58748006579cbdee
Commit Graph

30955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shivam Mishra
e1b96d70db refactor: show form buttons only if permissions exist (#23889) 
* refactor: show form buttons only if permissions exist

* fix: missing semicolon

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-15 16:42:55 +05:30
Marica
31e2c80e33 Merge pull request #23895 from marination/po-to-so-hotfix 
fix:  SO to PO flow improvement
 2020-11-13 11:26:14 +05:30
marination
09e1b5314b fix: Make sure row object has doctype so that read only property is applied to rows 2020-11-12 12:27:26 +05:30
marination
40ba013636 fix: SO to PO Mapping Issue 
- removed type: GET , which made the URL longer
- Added only relevant fields from Items table to Dialog table to reduce args load
- Made separate method to set table data in dialog
- Added freeze message
 2020-11-12 12:27:06 +05:30
Marica
16427c5cc8 fix: SO to PO flow improvement (#23357) 
* fix: SO to PO flow improvement

* fix: Dont map shipping_address

- shipping_address is a text field in SO and link field in PO
- Drop shipping case handles its mapping
- normal case doesnt need to map

* fix: Hide/Add rows depending on Against Default Supplier

* fix: Removed Default Supplier Select field from popup

- removed Default Supplier Select field from popup
- only loop through suppliers of selected items if via default supplier
- only check for items in selected items

* fix: Sales Order Drop Shipping Test

* fix: (translation)Multi line to single line strings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-12 12:23:27 +05:30
Deepesh Garg
7365566894 Merge pull request #23863 from rohitwaghchaure/incorrect-outstanding-amount-in-reverse-charge 
fix: incorrect outstanding amount for multicurrency with Reverse Charge
 2020-11-11 18:32:50 +05:30
Rohit Waghchaure
6b86586eb1 fix: incorrect outstanding amount for multicurrency with Reverse Charge 2020-11-11 17:32:42 +05:30
Marica
1ff8ae494d Merge pull request #23730 from AfshanKhan/fix-po-no-fetching-v12 
fix: copying po no when mapping doc
 2020-11-11 17:17:58 +05:30
Marica
02f856e968 Merge branch 'version-12-hotfix' into fix-po-no-fetching-v12 2020-11-11 12:20:05 +05:30
Afshan
38e681e8b2 fix: refactor 2020-11-11 11:47:23 +05:30
rohitwaghchaure
ecffa80216 Merge pull request #23878 from rohitwaghchaure/fix-stock-entry-consumption-issue-v12-hotfix 
fix: incorrect backflush qty in manufacture entry
 2020-11-10 23:23:33 +05:30
Rohit Waghchaure
cee0706a1f fix: incorrect backflush qty in manufacture entry 2020-11-10 15:55:01 +05:30
Anurag Mishra
bd49da45e3 feat: added column cost_center to receivable reports (#23837) 
* feat: added column cost_center to receivable reports

* Update accounts_receivable.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-09 20:21:25 +05:30
Marica
04458e7413 Merge pull request #23866 from marination/purchase-invoice-payment-terms-fix 
fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt
 2020-11-09 18:44:40 +05:30
marination
f5e4f75fd0 chore: Test case for Payment Terms in PI from PR 2020-11-09 16:15:56 +05:30
marination
80f5734305 fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt 2020-11-09 16:15:46 +05:30
Marica
c5096e0441 Merge pull request #23804 from marination/delievered-received-items-to-bill-report-fix 
fix: Received/Delivered Items to Be Billed Logic
 2020-11-09 14:50:50 +05:30
Marica
20b5b30e34 Merge branch 'version-12-hotfix' into delievered-received-items-to-bill-report-fix 2020-11-09 10:34:05 +05:30
Deepesh Garg
d196f14e85 Merge pull request #23859 from deepeshgarg007/india_tax_template_fetch_v12 
fix: Auto State-wise gst tax template
 2020-11-08 17:49:08 +05:30
Deepesh Garg
6beee63d06 fix: Auto State-wise gst tax template 2020-11-08 17:47:32 +05:30
rohitwaghchaure
fb6534cb65 Merge pull request #23816 from rohitwaghchaure/default-cost-center-set-in-item-not-showing 
fix: default cost center in item master not set in stock entry
 2020-11-06 17:46:11 +05:30
Marica
9876fa8360 Merge branch 'version-12-hotfix' into delievered-received-items-to-bill-report-fix 2020-11-06 12:23:18 +05:30
rohitwaghchaure
20bd91f0d9 Merge pull request #23830 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance 
fix: incorrect assign to in Maintenance Schedule
 2020-11-05 18:43:39 +05:30
Rohit Waghchaure
06b6027674 fix: not able to select assign to 2020-11-05 15:35:48 +05:30
Marica
3960c49fc6 Merge branch 'version-12-hotfix' into delievered-received-items-to-bill-report-fix 2020-11-05 12:31:59 +05:30
Afshan
7e6c79819a fix: refactor and test 2020-11-05 11:59:45 +05:30
rohitwaghchaure
533954cd12 Merge pull request #23815 from Anurag810/stock_ledger_report_v12 
fix:  list index out of range on incilding uom
 2020-11-05 11:49:37 +05:30
Rohit Waghchaure
7ee2b0ed3a fix: default cost center in item master not set in stock entry 2020-11-05 11:47:22 +05:30
Anurag Mishra
8e37316832 fix: list index out of range on incilding uom 2020-11-04 15:27:17 +05:30
Afshan
2860f62772 Fix leave ledger patch (#23806) 
* fix: leave ledger patch

* fix: modified patch date
 2020-11-04 14:15:26 +05:30
marination
4f008f59fc fix: Received/Delivered Items to Billed Logic 2020-11-03 23:12:53 +05:30
Deepesh Garg
1f10da4d66 Merge pull request #23786 from deepeshgarg007/pos_v12_hotfix 
fix: Place of Supply fix in Sales Invoices
 2020-11-02 11:23:47 +05:30
Deepesh Garg
7036635007 fix: fieldname 2020-10-30 22:15:23 +05:30
Deepesh Garg
c1719ef54b fix: Place of Supply fix in Sales Invoices 2020-10-30 22:15:23 +05:30
Afshan
c8201eba33 fix: leave ledger entries (#23782) 2020-10-30 18:47:52 +05:30
rohitwaghchaure
b2bd8ef144 Merge pull request #23773 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry 
fix: po_detail field has no value for subcontracted stock entry
 2020-10-30 14:19:55 +05:30
Rohit Waghchaure
e523cfbb02 fix: po_detail field has no value for subcontracted stock entry 2020-10-30 03:04:39 +05:30
Marica
d8705240a0 chore: (Production Plan) Simplify and fix translation in message popup (#23754) 2020-10-29 18:54:06 +05:30
Deepesh Garg
ab1415c0cc Merge pull request #23762 from rohitwaghchaure/fixed-subscription-test-case 
fix: subscription test case
 2020-10-29 17:04:12 +05:30
Rohit Waghchaure
2f12eed44d fix: subscription test case 2020-10-29 15:52:33 +05:30
rohitwaghchaure
c9e93fd9b1 Merge pull request #23740 from prssanna/job-card-gantt 
fix: override field_map for job card gantt
 2020-10-29 14:50:19 +05:30
Rucha Mahabal
82db751a52 fix: LMS sign-up link (#23752) 2020-10-29 11:19:34 +05:30
Marica
2d936fe5ca Merge pull request #23748 from marination/leave-type-filter 
fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050)
 2020-10-28 17:23:45 +05:30
Abhishek Balam
d0541d77b3 Merge branch 'version-12-hotfix' into leave-type-filter 2020-10-28 16:29:06 +05:30
Anurag Mishra
5f148d3d3a fix: set_query in leave application (#22197) 2020-10-28 16:25:57 +05:30
Abhishek Balam
6c894f8f41 fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050) 
* table was showing empty with just headers when no leaves allocated, fixed template code

* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
 2020-10-28 16:12:57 +05:30
Marica
5effbeef49 Merge pull request #23733 from AfshanKhan/prod-order-reference-in-item-v12 
fix: Remove Production Order reference from Item Validation
 2020-10-28 16:09:52 +05:30
prssanna
1fa8dcb15b fix: override field_map for job card gantt 2020-10-28 11:02:02 +05:30
Afshan
0c511b31fd fix: Remove Production Order reference from Item Validation 2020-10-26 20:34:48 +05:30
Afshan
17a8874c50 fix: copying po no when mapping doc 2020-10-26 17:07:40 +05:30