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

29479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
8b599f2bc9 fix: capacity planning back 2019-11-29 14:09:30 +05:30
Suraj Shetty
9d6d95c4a2 fix: valuation of "finished good" item in purchase receipt (#19268) 
* fix: Remove redundant purchase orders and unwanted condition

* fix: [WIP] Purchase receipt value

* fix: Add raw material cost based on transfered raw material

* fix: get_qty_to_be_received

* fix: Remove debugger statement

* fix: Reset rm_supp_cost before setting subcontracted raw_materials

* test: Fix and modify tests for backflush_based_on_stock_entry

* fix: Add non stock items to Purchase Receipt from Purchase Order

* fix: Ignore valuation rate check for non stock raw material

* fix: Rename check all rows

* fix: Remove amount from test

* test: Fix item rate error

* fix: handling of serial nos in backflush

* fix: Add serial no. of raw materials

* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material

* fix: Raw material batch number selection in purchase receipt

* Update test_purchase_order.py
 2019-11-29 13:26:52 +05:30
Marica
8f48896261 fix: Permission issue in Stock Entry (#19738) 2019-11-28 19:39:49 +05:30
Mangesh-Khairnar
2597817cde fix: add new routes to handle category wise search 2019-11-28 18:57:42 +05:30
Anurag Mishra
f3b393f5e0 fix: UOM was not fetching in purchase invoice (#19732) 
* fix: UOM was not fetching in purchase invoice

* fix: Changes requested

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2019-11-28 18:52:16 +05:30
Deepesh Garg
7cdde93645 fix: Validation for parent cost center (#19664) 
* fix: Validation for parent cost center

* fix: Minor modification in condition

* fix: Update test cases for invalid cost center creation
 2019-11-28 18:37:51 +05:30
Joseph Marie Alba
5c2ba0ef9c Fix: Logic bug (#19692) 
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)]
  - if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group.
  - should be if accounts[d]['is_group'] not in ('', 0)

However, the correction provided here:

    account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1]

is more consistent with the prior statement that extracts ledger (and not group) accounts.
    account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]
 2019-11-28 18:33:20 +05:30
Deepesh Garg
9f3276046f fix: Account type in Handling Difference in Inventory account (#19674) 
* fix: Account type in Handling Difference in Inventory account

* fix: Add Stock Adjustment account

* fix: Rename account to stock adjustment
 2019-11-28 18:29:33 +05:30
Saqib
707b83940a fix: due date before posting date for items added to cart yesterday (#19681) 2019-11-28 18:27:17 +05:30
Marica
bcd02069ea fix: Validation for Suppliers in SO to PO (#19686) 
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
 2019-11-28 18:23:45 +05:30
Marica
aff678e376 fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702) 2019-11-28 18:20:48 +05:30
Shivam Mishra
2512962f55 fix: handle None case for get_shipping_amount_from_rules (#19723) 2019-11-28 16:46:58 +05:30
Marica
f51ccbf5d4 chore: Added Quick Stock Balance to Stock Module (#19726) 
- Also 'Stock Balance Report' button no longer primary button
 2019-11-28 16:44:46 +05:30
rohitwaghchaure
1511154aa8 fix: removed stock value and account balance out of sync validation (#19729) 
* fix: revert value out of sync feature

* fix: removed stock value and account balance out of sync validation
 2019-11-28 16:43:39 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard 
feat: Slides for Onboading Wizard in ERPNext
 2019-11-28 14:35:10 +05:30
Deepesh Garg
2d840ab151
Merge pull request #19717 from deepeshgarg007/set_expired_sattus 
fix: Path for quotation expiry method in hooks
 2019-11-28 12:23:58 +05:30
deepeshgarg007
2fe0c98772 fix: Path for quotation expiry method in hooks 2019-11-28 08:09:47 +05:30
gavin
638abca498
Merge pull request #19571 from gavindsouza/updated-requirements 
chore: pinned requirements
 2019-11-27 20:27:27 +05:30
gavin
9629bec6e3
Merge branch 'develop' into updated-requirements 2019-11-27 19:38:47 +05:30
Anurag Mishra
707bb2052c fix: Employee dashboard disappear after switching from leave application form (#19690) 2019-11-27 16:27:50 +05:30
Marica
f0e87f7fdd fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693) 2019-11-27 15:49:41 +05:30
Gavin D'souza
7331964803 fix(travis): add lib cups for updated frappe requirements 2019-11-27 14:55:57 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c fix: moved slide json files to respective modules 2019-11-26 18:46:17 +05:30
Rucha Mahabal
3f8c460584 feat: moved slide action functions from onboarding utils to doctypes 2019-11-26 15:22:45 +05:30
Rucha Mahabal
195893db0e fix: conditionally run old patch for Setup Progress 2019-11-26 15:22:05 +05:30
Shivam Mishra
a791170f29
Merge pull request #19475 from 0Pranav/scheduling-ui-rewrite 
feat: Appointment Schedulling
 2019-11-26 13:43:14 +05:30
rohitwaghchaure
b5991e9264
Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12 
fix: BOM UX
 2019-11-26 13:15:40 +05:30
0Pranav
fb1e87710b Tweaks to success redirect 
- 5 seconds wait before redirect
- Edited description for URL in settings
 2019-11-26 12:14:41 +05:30
0Pranav
8d2b0d800c Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite 2019-11-26 10:55:53 +05:30
0Pranav
2515022377 add condition for zero appointment slots 2019-11-26 10:55:28 +05:30
Deepesh Garg
5558ee8597
Merge pull request #19591 from 0Pranav/FR-ISS-152101 
fix: add status "expired" to doctype quotation
 2019-11-26 09:08:30 +05:30
Deepesh Garg
31a4fa5dd3
Merge pull request #19606 from deepeshgarg007/shareholder_refactor 
refactor: Share Transfer code cleanup and refactor
 2019-11-26 07:54:57 +05:30
deepeshgarg007
53a66ee386 fix: Method name in hooks, test case code clean up 2019-11-25 21:58:15 +05:30
rohitwaghchaure
0881557c7d
Merge pull request #19636 from rohitwaghchaure/not_able_to_submit_sales_invoice_e_invoice_issue 
fix: e-invoice issue
 2019-11-25 19:24:23 +05:30
Rohit Waghchaure
9326fb78f2 fix: BOM UX 2019-11-25 18:56:18 +05:30
Nabin Hait
ecc6b1917b Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-11-25 18:13:58 +05:30
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +05:30
Pranav Nachnekar
fc5d8fcd9f
Merge branch 'develop' into scheduling-ui-rewrite 2019-11-25 12:24:32 +00:00
0Pranav
b84e56ebb5 fix:travis tests 2019-11-25 17:32:02 +05:30
0Pranav
565d3efcdf fetch updated document in test_quotation 2019-11-25 17:11:12 +05:30
Pranav Nachnekar
d63ad3bb5f fix: add email group and newsletter links to CRM module view (#19679) 
* fix: add email group and newsletter links to CRM module view

* chore: move email group to bottom
 2019-11-25 16:50:47 +05:30
0Pranav
f9dec5201f fix:tests 2019-11-25 16:42:07 +05:30
0Pranav
cf3a2f6579 set transaction date to yesterday 2019-11-25 16:26:04 +05:30
0Pranav
032baeac5b don't submit quotation 2019-11-25 15:15:00 +05:30
Nabin Hait
e0912e4fcc Merge branch 'v12-pre-release' into version-12 2019-11-25 15:11:24 +05:30
Nabin Hait
4d12f8acab bumped to version 12.2.0 2019-11-25 15:31:23 +05:50
Nabin Hait
c856cb85d9 log: Change log for v12.2.0 2019-11-25 15:08:47 +05:30
0Pranav
754c43f6c3 fix set_expired_status method 2019-11-25 14:27:43 +05:30
0Pranav
e0c9f3c282 fix valid date 2019-11-25 14:14:51 +05:30