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

3615 Commits

Author SHA1 Message Date
Robin Rosenstock
e6387f9dca fix to issue #20089 2019-12-26 08:09:47 +00:00
Himanshu
e2ea11c437 fix: remove quote (#20076) 2019-12-25 15:15:35 +05:30
Parth J. Kharwar
8c4cf12c93 Setting preferred driver email in delivery trip (#19832) 
* fix: add driver's preferred contact email in delivery trip

* fix: modify driver's preferred email patch and blank field checks

* fix: patch file fix

* fix: patch changes to improve speed

* fix: removal of conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-25 15:14:52 +05:30
rohitwaghchaure
6e8a9286c2 fix: multiple stock entry issues for the work order (#18686) 
* fix: multiple stock entry issues for the work order

* Update work_order.py

* Update work_order.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-24 18:53:32 +05:30
rohitwaghchaure
5c0ea2d7c9
Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger 
feat: drill down on batch transactions (develop)
 2019-12-24 15:25:05 +05:30
rohitwaghchaure
08433c2919 fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071) 2019-12-24 13:03:47 +05:30
Deepesh Garg
55bc26e300 fix: Allow creation of multiple landed cost voucher against a Purchase Document (#20058) 2019-12-24 12:55:01 +05:30
Himanshu
5af4c57ef7 fix: ambihious error (#20068) 2019-12-24 12:31:38 +05:30
Rucha Mahabal
0e83a5754b fix: remove illustrations from onboarding slides (#19872) 
* fix: remove illustrations from onboarding slides

* fix: change Welcome slide's description

* fix: justify text in slide
 2019-12-23 08:24:46 +05:30
marination
457ca0fe6c fix: Company None not found in get_valuation_rate 2019-12-19 13:34:29 +05:30
rohitwaghchaure
b500f2ce4c
Merge pull request #19940 from marination/item_manufacturer_table_dev 
fix: Removed 'manufacturers' table from Item Master
 2019-12-16 14:44:49 +05:30
marination
5ab823beab fix: Removed validation from non existent manufacturers table 2019-12-16 12:19:47 +05:30
marination
81990aee9f fix: Removed 'manufacturers' table from Item Master 2019-12-13 13:18:59 +05:30
Deepesh Garg
57e6bcaf43
Merge pull request #19733 from marination/zero-division-basic-amount 
fix: Division by zero error in Stock Entry
 2019-12-13 09:23:44 +05:30
marination
0e33f792d3 fix: Distribute charges based on quantity if Total Basic Amount is Zero. 2019-12-12 16:34:41 +05:30
Rohit Waghchaure
9b0d7b93dd fix: not able to submit the landed cost voucher 2019-12-12 12:10:25 +05:30
Deepesh Garg
0e10340471
Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher 
fix: not able to cancel the landed cost voucher
 2019-12-11 18:38:23 +05:30
Rohit Waghchaure
37cf096102 fix: not able to cancel the landed cost voucher 2019-12-11 13:50:29 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469) 
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
 2019-12-10 15:55:05 +05:30
marination
214acc9a42 fix: Changed check condition and added test 2019-12-09 21:38:19 +05:30
Saqib
5998034b02 fix: error message displays asset category as None (#19873) 
* fix: error message displays asset category as None

* fix: asset gl_entries doesn't considers asset category's cwip account
 2019-12-09 19:07:05 +05:30
Shivam Mishra
9e0b3b29fa feat: better message for serial number creation (#19863) 2019-12-09 18:21:23 +05:30
Deepesh Garg
da638cd476 fix: NoneType' object has no attribute '__getitem_'_ (#19859) 2019-12-09 11:28:31 +05:30
Rucha Mahabal
690068142b feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813) 
* feat: added illustrations for onboarding

* refactor: change help label for supplier

* refactor (breaking): rename Setup Wizard slide to Onboarding Slide

* chore: code cleanup for the old doctype Setup Wizard Slide

* fix: added a 'Continue' type slide

* fix: change text in continue slide

* fix: change text for continue slide
 2019-12-06 20:58:26 +05:30
Rohan
5161ba787c
Merge branch 'develop' into dev-batch-to-stock-ledger 2019-12-06 14:25:00 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch 
feat: Provision to fetch items from multiple BOMs in Stock Entry
 2019-12-04 21:44:47 +05:30
ronelvcabrera
370cdc0170 feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612) 2019-12-04 16:07:11 +05:30
marination
be88d0f8a3 fix: Custom button conditionally visible in draft condition as well 2019-12-03 18:34:38 +05:30
Anurag Mishra
10017c14f3 feat: HSN Code wise Item Tax (#19478) 
* feat: HSN Code wise Item Tax

* feat: enqueued task of updating all items
 2019-11-29 17:33:10 +05:30
Saqib
20c31dd579 fix: tax templates from all companies fetching in receipt (#19682) 
* fix: tax templates from all companies fetching in receipt

* Update purchase_receipt.js
 2019-11-29 16:55:10 +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
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
Marica
aff678e376 fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702) 2019-11-28 18:20:48 +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
marination
236140d94c fix: Division by zero error in Stock Entry 2019-11-28 16:36:24 +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
Rohan Bansal
c7cfc726d7 feat: navigate to stock ledger from batch report 2019-11-27 18:23:31 +05:30
Marica
f0e87f7fdd fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693) 2019-11-27 15:49:41 +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
rohitwaghchaure
b5991e9264
Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12 
fix: BOM UX
 2019-11-26 13:15:40 +05:30
Rohit Waghchaure
9326fb78f2 fix: BOM UX 2019-11-25 18:56:18 +05:30
marination
737d8a1e26 fix: Added comments 2019-11-25 09:42:08 +05:30
Saqib
1919af2ff1 Fixed Asset Refactor Review fixes (#19666) 
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
 2019-11-22 16:32:34 +05:30
Marica
b5c296da9e fix: Validation Error message on Prepared Report. (#19639) 
Give the user the reason why he has to use filters.
 2019-11-22 14:38:58 +05:30
Saqib
290253fdd0 fix: last purchase rate greater than selling price (#19617) 2019-11-22 12:12:29 +05:30
Nabin Hait
046137caa2
fix: Multiple fixes related to landed cost accounting (#19657) 2019-11-22 11:34:50 +05:30
marination
e537cda062 fix: Added conditional check for conversion factor 2019-11-20 12:38:58 +05:30
rohitwaghchaure
a85ddf2fb4 fix: performance issue of sales invoice while save/submit (#19598) 
* fix: performace issue of sales invoice while save/submit

* Cached price list data, item group child data, added indexing for blanket order
 2019-11-19 18:47:48 +05:30