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

3652 Commits

Author SHA1 Message Date
Deepesh Garg
0c31d62edd
Merge pull request #20447 from Alchez/dev-driver-address-fetch 
fix: only fetch driver address if not set (develop)
 2020-01-28 09:20:26 +05:30
rohitwaghchaure
7fda3a12cc
Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item 
fix: to warehouse not set in the customer warehouse
 2020-01-27 19:29:19 +05:30
Rohan Bansal
ce17a546b9 fix: only fetch driver address if not set 2020-01-27 18:08:11 +05:30
Rohit Waghchaure
2dff28498f fix: to warehouse not set in the customer warehouse 2020-01-27 17:56:25 +05:30
Deepesh Garg
1e77a1374d
Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop 
fix: unlink references from batch on cancellation of stock transactions
 2020-01-23 22:40:26 +05:30
Rohit Waghchaure
8996b7d8a4 delete the auto created batch 2020-01-23 17:44:19 +05:30
Rohit Waghchaure
4f4dbf1996 fix: unlink references from batch on cacnellation of stock transactions 2020-01-23 12:45:45 +05:30
Rohit Waghchaure
0cc4cf2cf5 fix: Zero division error while making finished good entry against the work order 2020-01-21 19:28:08 +05:30
byugandhara
239f0d529e Fix: Spelling correction in throw message of stock entry(#20337) (#20353) 2020-01-21 15:47:27 +05:30
rohitwaghchaure
6ae61a1693 fix: incorrect number of gl entries issue (#20352) 2020-01-20 17:53:19 +05:30
Marica
7653a8b9fa fix: 'get_additonal_costs' is not defined (#20344) 
* fix: 'get_additonal_costs' is not defined

* fix: Re-added get_items on Work order change.
 2020-01-20 15:46:36 +05:30
Nabin Hait
03b116dd01
fix: deprecated fetching item price based on min_qty (#20347) 2020-01-20 15:45:04 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch (#20301) 
* fix: Multiple fixes based on testing on pre-release branch

* fix: reload hr settings
 2020-01-16 13:37:25 +05:30
Vishal Dhayagude
654d785776 fix: Delivery note not able to create sales return (#20264) 2020-01-15 19:28:58 +05:30
Marica
9f6c95549a fix: Applied query on PO Supplier popup field in Material Request. (#20231) 2020-01-15 19:24:28 +05:30
Rohit Waghchaure
9650c25429 fix: filter issue for the stock and account value comparision report 2020-01-14 12:12:54 +05:30
deepeshgarg007
00746306a3 fix: Item tax template fetching from HSN Code 2020-01-10 15:01:50 +05:30
gavin
12568e4f07
Merge pull request #19514 from gavindsouza/rename-doc-fix 
fix: frappe.rename_doc update
 2020-01-09 15:07:05 +05:30
rohitwaghchaure
d4d7d211ea feat: report to show difference between stock and account value (#20186) 2020-01-09 15:05:05 +05:30
Suraj Shetty
000ac0068b
Merge branch 'develop' into rename-doc-fix 2020-01-09 13:46:08 +05:30
Don-Leopardo
ccdf19314d fix: min_qty and valid_from for the price selection (#20217) 2020-01-09 12:24:43 +05:30
Marica
c72de6edaa fix: Added description and title to supplier selection popup in Material Request. (#20179) 2020-01-07 13:06:08 +05:30
Deepesh Garg
ef0d26c161 feat: Validity for Item taxes (#20135) 
* feat: Validity for Item taxes

* fix: Trigger for gst hsn code

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
 2020-01-06 15:34:15 +05:30
rohitwaghchaure
055012a7fb
Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate 
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
 2020-01-06 12:07:53 +05:30
rohitwaghchaure
fe2afc643e fix: incorrect valuation rate for finished good entry (#20165) 2020-01-06 11:51:43 +05:30
Marica
159799c238
Merge branch 'develop' into item-min-qty 2020-01-03 12:13:00 +05:30
thefalconx33
7a01367ef1 ux: add description for minimum purchase qty 2020-01-02 19:14:55 +05:30
Nabin Hait
328c4f9b92 fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company 2020-01-02 19:00:47 +05:30
Rohan
938ba3efc4 feat: show item name in Item Price list view (#20156) 2019-12-31 17:21:07 +05:30
Marica
5483f1a27e fix: Field 'other_charges_calculation' column type changed. (#20141) 2019-12-30 22:20:02 +05:30
rohitwaghchaure
9af557f9d7 fix: incorrect batch fetched for the serialized items (#20119) 
* fix: incorrect batch fetched for the serialized items

* Update stock_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-30 13:26:47 +05:30
Ishan Loya
fe0adc8b25 fix: read WIP warehouse from work order (#20131) 
* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked

* fix: remove skip_transfer in stock entry

Related to #10753
 2019-12-30 12:19:08 +05:30
Marica
f4fbdf98d1 fix: Removed unneccesary Duplicate Entry Error. (#20120) 2019-12-27 16:53:05 +05:30
Marica
47ab9850e6 fix: Show both warehouse columns in Stock Entry Grid view. (#20113) 2019-12-27 15:31:07 +05:30
rohitwaghchaure
616431d7c3 fix: incorrect reorder level in stock balance report (#20111) 2019-12-27 12:35:58 +05:30
rohitwaghchaure
a99f926a4b fix: incorrect validation for scrap items (#20109) 2019-12-27 12:21:15 +05:30
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
Gavin D'souza
1e4ea466d3 style: update/standardize rename_doc usage 2019-12-19 19:07:29 +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