Rushabh Mehta
2cd41bca06
fix(routes): desk to app
2020-12-18 13:17:58 +05:30
Prssanna Desai
421bfee874
Merge branch 'develop' into job-card-gantt-v13
2020-12-16 16:59:50 +05:30
prssanna
ff59f18012
fix: override field_map for job card gantt
2020-12-16 16:56:30 +05:30
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Suraj Shetty
f2511c84b5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-14 09:05:48 +05:30
Rohit Waghchaure
edb99d4e53
fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled
2020-12-12 16:03:07 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Mohammad Hasnain
59dffb96b3
fix(Production Planning): incorrect required qty
2020-12-08 11:13:00 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Nabin Hait
029b9c08dd
Update bom.py
2020-12-01 09:33:17 +05:30
Anurag Mishra
66e8a12d0f
fix: KeyError 'sourced_by_supplier'
2020-11-30 17:53:28 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
rohitwaghchaure
10c168e257
fix: default cost center in item master not set in stock entry ( #23877 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-30 14:58:00 +05:30
Rohit Waghchaure
d6a2b390dc
fix: not able to save bom
2020-11-30 14:58:00 +05:30
Rucha Mahabal
6b57cf3285
feat: Quality Inspection on Job Card ( #23964 )
...
* feat: Quality Inspection on Job Card
* fix(Job Card): quality inspection filter query
* fix: sider issues
2020-11-25 09:17:16 +05:30
rohitwaghchaure
f38abdeac0
Merge pull request #23994 from rohitwaghchaure/bom-stock-project-item-color-develop
...
fix: bom stock report color showing always red
2020-11-24 21:16:51 +05:30
rohitwaghchaure
5ab2e6c1ff
Merge pull request #23991 from pateljannat/job-card-operation-field-error
...
fix: job card error handling for operations field
2020-11-24 17:05:44 +05:30
Rohit Waghchaure
5a33f2c394
fix: bom stock report color showing always red
2020-11-24 16:59:36 +05:30
pateljannat
b67ebc7636
fix: job card error handling for operations field
2020-11-24 15:37:30 +05:30
rohitwaghchaure
f9a44000d9
Update bom_stock_report.js
2020-11-23 15:40:06 +05:30
Rohit Waghchaure
610d9ca649
fix: bom stock report color issue
2020-11-23 14:10:55 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
rohitwaghchaure
1c8c1d78e9
fix: default cost center in item master not set in stock entry ( #23877 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-15 09:40:44 +05:30
Rohit Waghchaure
4abc5657ab
fix: not able to save bom
2020-11-13 22:18:48 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
Jannat Patel
e008f85816
Merge branch 'develop' into production-planning-status-filter
2020-11-11 10:00:39 +05:30
pateljannat
d08c91673a
fix: removed unnecessary filter options
2020-11-10 18:04:30 +05:30
Rohit Waghchaure
dd87bcfda0
fix: on save sequence id column override with workstation
2020-11-04 13:26:03 +05:30
Rohit Waghchaure
81b2c8ed60
fix: sequence id override with operation column
2020-11-04 13:10:03 +05:30
pateljannat
846ff323e2
feat: sales order status filter for production plan
2020-11-03 17:35:44 +05:30
Nabin Hait
b7285fdcad
Merge branch 'develop' into prod-plan-status
2020-10-29 18:58:32 +05:30
Marica
bf54ea9976
chore: (Production Plan) Simplify and fix translation in message popup ( #23753 )
2020-10-29 18:54:36 +05:30
marination
689b77d1ed
fix: Don't show buttons if status is Completed
2020-10-26 16:28:39 +05:30
marination
097b32fe67
feat: Close Production Plan
2020-10-26 15:27:37 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings ( #23612 )
...
* fix(Stock Settings): Type/Grammatical fixes in Settings
* fix: grammatical fixes in manufacturing settings
* fix: typo fix in accounting settings
* fix: typo fixes in HR settings
* fix: typo fixes in buying settings
* fix: typo fixes in Selling Settings
* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Update accounts_settings.json
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
rohitwaghchaure
93bbc52a68
feat: added sequence id in routing for the completion of operations sequentially ( #23641 )
...
* feat: added sequence id in routing for the completion of operations sequentially
* fix: translation syntax
2020-10-23 18:18:03 +05:30
Rohit Waghchaure
fa842e8774
fix: incorrect backflush qty in manufacture entry
2020-10-22 13:35:27 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Rohit Waghchaure
6471912216
fix: not able to do overproduction
2020-10-20 10:02:01 +05:30
rohitwaghchaure
21bf5e9b8e
Fixed incorrect operation time calculation develop ( #23674 )
...
* fix: incorrect operation time calculation for batch size
* Update test_work_order.py
2020-10-19 10:38:48 +05:30
rohitwaghchaure
e30397bf2e
Merge pull request #23668 from rohitwaghchaure/incorrect-work-order-qty-againt-production-plan-develop
...
fix: production plan incorrect work order qty (#23264 )
2020-10-16 17:41:25 +05:30
rohitwaghchaure
f01856d7a9
fix: production plan incorrect work order qty ( #23264 )
...
* fix: production plan incorrect work order qty
* added test case
* Update test_production_plan.py
2020-10-16 15:19:23 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
Marica
c5e139a542
fix: Travis ( #23606 )
...
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places
* fix: Item Barcode and Test
* fix: Over Receipt on subcontracting test
* fix: POS Invoice and Loyalty Program Tests
* fix: POS serialized item test and subcontracting exploded items in PO
* fix: Subcontracting test considering sourced_by_supplier items
* fix: Make only one Additonal Salary List with overwrite set
2020-10-13 16:53:10 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux
2020-10-12 15:17:32 +05:30
Rushabh Mehta
2bef986f14
Merge pull request #23450 from michellealva/jc
...
fix: Change Error Message in Work Order
2020-10-12 15:07:21 +05:30
