Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,832 Commits 3 Branches 0 Tags 1 GiB
941e21092c
Commit Graph

3369 Commits

Author SHA1 Message Date
Deepesh Garg
941e21092c
Merge branch 'develop' into stock_ageing_fix 2019-07-26 12:47:05 +05:30
deepeshgarg007
15154d4bd0 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-26 10:30:22 +05:30
Aditya Hase
1e82638ae8 perf(tests): Remove unnecessary tearDown code 2019-07-26 03:52:17 +05:30
Aditya Hase
ff79463e36 perf(travis): Use setUpClass instead of setUp 2019-07-26 03:08:45 +05:30
Aditya Hase
6bc2988623 fix(stock): Fix travis builds 2019-07-26 03:08:45 +05:30
deepeshgarg007
a19d1d6926 fix: Fixes in stock ageing report 2019-07-23 08:30:09 +05:30
Nabin Hait
cd1094e1c2 Merge branch 'rohitwaghchaure-stock_reco_for_serialized_items' into develop 2019-07-22 17:01:08 +05:30
Nabin Hait
ca25b925f5 fix: Calcellation logic for reconciliation of serialized items 2019-07-22 17:00:32 +05:30
deepeshgarg007
d9cc84892b fix: Use get_serial_no and remove batch 2019-07-22 15:56:41 +05:30
deepeshgarg007
3877b5407c fix: Remove batch 2019-07-22 15:30:18 +05:30
deepeshgarg007
55ca054cb4 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-22 12:46:30 +05:30
Anurag Mishra
305da799a4 Handling case for Material Request type 'Manufacture' v12 (#18365) 
* fix: status for 'material request type == Manufacture'

* Patch: for setting status

* fix: list view status
 2019-07-22 11:35:16 +05:30
Himanshu
73d446023d fix: file attach via import (#18414) 2019-07-22 11:19:47 +05:30
Deepesh Garg
60a291af8f fix: Sample qty validation fix in purchase receipt (#18419) 
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2019-07-22 11:14:14 +05:30
Himanshu
0a8816e053 feat(Google Maps): Google Maps Refactor [Unified Google API Settings] (#18110) 2019-07-19 14:38:04 +05:30
rohitwaghchaure
3403d1cc44
Merge pull request #18095 from scmmishra/remove-move-stock-summary 
refactor: move and add for serialized and batch items in stock summary
 2019-07-17 18:50:00 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes 2019-07-16 16:17:07 +05:30
deepeshgarg007
4a7f370b15 fix: Consider serial no and batches in Stock ageing report 2019-07-16 16:08:50 +05:30
Shivam Mishra
7339c72208
Update item_dashboard.js 2019-07-16 13:19:13 +05:30
Shivam Mishra
5738c93b8f style: commonified move and add button handler 2019-07-16 12:52:19 +05:30
Shivam Mishra
7ab6010225 Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary 2019-07-16 12:33:13 +05:30
Shivam Mishra
fd6ff62bdb style: code styling fixes 2019-07-16 12:32:50 +05:30
deepeshgarg007
6ecbd97fbe Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-16 09:02:48 +05:30
Nabin Hait
6e264701cb Merge branch 'stock_reco_for_serialized_items' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-stock_reco_for_serialized_items 2019-07-15 18:12:49 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788) 
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
 2019-07-15 18:02:58 +05:30
deepeshgarg007
1cc46c06b0 Merge branch develop into ac_dim_usability_fixes 2019-07-15 15:34:40 +05:30
Faris Ansari
280fe396b9 fix: Dont rebuild cache on cache bust (#18319) 
- Results in a lot of stale background jobs
- Cache will be built when needed
 2019-07-15 14:30:21 +05:30
Mangesh-Khairnar
1ac9a8e82e fix(bin): update requested qty in bin (#18297) 2019-07-15 14:08:47 +05:30
deepeshgarg007
a85db66146 fix: Usability fixes in accounting dimensions 2019-07-14 18:15:19 +05:30
deepeshgarg007
581d931031 fix: Enhancement in stock ageing report 2019-07-13 21:58:32 +05:30
deepeshgarg007
d43d19acfd Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-13 11:40:05 +05:30
Shivam Mishra
5594ea5298
Merge branch 'develop' into remove-move-stock-summary 2019-07-12 16:04:12 +05:30
Deepesh Garg
d73426a3bc fix: Add status field at parent level in quality inspection and minor UX fix (#18263) 
* fix: Add status field at parent level and minor UX fix

* fix: Set default status as Accepted
 2019-07-12 14:44:22 +05:30
Deepesh Garg
587bdf09eb
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 12:30:42 +05:30
Anurag Mishra
53e7df078e fix: set project link in item tables (#18233) 2019-07-12 12:05:39 +05:30
Saurabh
acaf76a6de
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 11:10:12 +05:30
rohitwaghchaure
b390b70ee3 fix: set project in material request when pull items from bom (#18256) 2019-07-11 15:22:03 +05:30
rohitwaghchaure
058787d204 fix: error report for item price (#18212) 2019-07-10 17:03:48 +05:30
deepeshgarg007
1dc124cf75 fix: Changed columns to new dict form 2019-07-10 14:49:25 +05:30
Shivam Mishra
eb7c037bdf Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary 2019-07-10 10:22:20 +05:30
Shivam Mishra
444091b350 refactor: disable quick entry for batched and serialized items 2019-07-10 10:22:08 +05:30
rohitwaghchaure
8a054e4b36
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry 
feat: provision to make debit / credit note against the stock returned entry
 2019-07-07 00:51:46 +05:30
Bhavishya Sharma
607611ebdc codacy fix 2019-07-06 15:02:57 +05:30
Bhavishya Sharma
db3c5625ae feat: Manufacturer is Missing Contacts 2019-07-06 13:54:30 +05:30
rohitwaghchaure
6ea1f7becf
Merge pull request #18177 from scmmishra/po-patch-1 
refactor: added throw if supplier is not default for any item
 2019-07-05 18:12:56 +05:30
Rohit Waghchaure
5d4d70b75f feat: provision to make debit / credit note against the stock returned entry 2019-07-05 17:06:25 +05:30
Shivam Mishra
6277966105 chore: added check for auto-reorder in stock settings (#18174) 
* chore: added check for auto-reorder in stock settings

* style: removed explicit return
 2019-07-05 15:58:13 +05:30
Suraj Shetty
83f767b5a3
Merge pull request #18173 from karthikeyan5/develop-add-manufacturing-dashboards 
feat(manufacturing): added dashboard for doctypes
 2019-07-05 14:22:13 +05:30
Shivam Mishra
7a7c66e95e refactor: added throw if supplier is not default for any item 2019-07-05 13:06:53 +05:30
Rohit Waghchaure
cdb75b56c5 fix: removed item manaufacturer child table from item master 2019-07-05 12:24:14 +05:30