Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,310 Commits 3 Branches 0 Tags 1 GiB
5dd1b50802
Commit Graph

3402 Commits

Author SHA1 Message Date
Mangesh-Khairnar
5dd1b50802 fix: update show in website on disabling item (#18831) 2019-08-26 10:27:25 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660) 
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
 2019-08-23 11:42:35 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
Mangesh-Khairnar
0df513434e fix: valuation rate in stock ledger (#18744) 
* fix: valuation rate in stock ledger

* test: allow zero valuation rate for items
 2019-08-19 10:04:52 +05:30
Mangesh-Khairnar
ca55af836b fix: travis 2019-08-14 16:32:02 +05:30
Mangesh-Khairnar
06ce1f5a40 fix(quality-inspection): fetch all items for inspection type in process (#18716) 
* fix(quality-inspection): fetch all items for inspection type in process

* fix(quality-inspection): add server side validation for in process items
 2019-08-14 14:25:59 +05:30
DeeMysterio
1c728a7cf8 fix(delivery note): change the text invoice to sales invoice on make button (#18658) 2019-08-12 13:04:25 +05:30
DeeMysterio
cfce53103b fix(delivery note): change the text invoice to sales invoice on make button (#18666) 2019-08-12 13:03:55 +05:30
Himanshu
19199baf29 fix: miscellaneous fixes (#18615) 2019-08-12 12:17:28 +05:30
Himanshu
ebf38c5ebd fix: misc fixes (#18616) 2019-08-12 12:17:16 +05:30
Faris Ansari
99c26e068d fix: Set Maintenance Status fields as Read Only (#18634) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:49 +05:30
Faris Ansari
cfd19afabf fix: Set Maintenance Status fields as Read Only (#18633) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:44 +05:30
Faris Ansari
df7644a96d fix: Show created serial nos as links in message (#18635) 
Fixes #18623
 2019-08-08 15:50:24 +05:30
Faris Ansari
afae8a0c46 fix: Show created serial nos as links in message (#18636) 
Fixes #18623
 2019-08-08 15:50:17 +05:30
rohitwaghchaure
9601b6c601 feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533) 2019-08-05 10:40:23 +05:30
Suraj Shetty
b559bf6de6
Merge branch 'version-12-hotfix' into stock-ledger-fix 2019-08-02 08:43:54 +05:30
rohitwaghchaure
fdb5e6b2e5
Merge pull request #18531 from rohitwaghchaure/scrap_item_not_adding_v12_hotfix 
fix: scrap item not adding while doing finished good entry
 2019-07-31 00:47:01 +05:30
Rohit Waghchaure
862363521b fix: scrap item not adding while doing finished good entry 2019-07-30 23:57:58 +05:30
deepeshgarg007
f9c0ef3eb3 fix: Check zero valuation rate only for valid doctypes 2019-07-30 19:01:53 +05:30
deepeshgarg007
548293ad08 fix: Check zero valuation rate only for valid doctypes 2019-07-30 18:49:19 +05:30
rohitwaghchaure
a55e4e2c03
Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding 
fix: scrap item not adding while doing finished good entry
 2019-07-29 15:30:24 +05:30
Saurabh
af19347376
Merge branch 'develop' into scrap_item_not_adding 2019-07-26 15:10:17 +05:30
Deepesh Garg
64968979b2
Merge branch 'version-12-hotfix' into stock-ageing-v12 2019-07-26 14:42:34 +05:30
Deepesh Garg
941e21092c
Merge branch 'develop' into stock_ageing_fix 2019-07-26 12:47:05 +05:30
deepeshgarg007
06f99cae36 fix: Fixes in stock ageing report 2019-07-26 10:32:08 +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
deepeshgarg007
7fdab021b6 fix: Use get_serial_no and remove batch 2019-07-26 10:26:13 +05:30
deepeshgarg007
1495c9599a fix: Remove batch 2019-07-26 10:25:54 +05:30
deepeshgarg007
e3a2ab184e fix: Consider serial no and batches in Stock ageing report 2019-07-26 10:25:15 +05:30
deepeshgarg007
f7733be322 fix: Enhancement in stock ageing report 2019-07-26 10:25:04 +05:30
deepeshgarg007
4d53992b35 fix: Changed columns to new dict form 2019-07-26 10:24:40 +05:30
Aditya Hase
f2fb461e40 perf(tests): Remove unnecessary tearDown code 2019-07-26 05:54:04 +05:30
Aditya Hase
f4314a25b6 perf(travis): Use setUpClass instead of setUp 2019-07-26 05:54:04 +05:30
Aditya Hase
bd69f43322 fix(stock): Fix travis builds 2019-07-26 05:54:04 +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
Rohit Waghchaure
bcfbc792b4 fix: scrap item not adding while doing finished good entry 2019-07-23 16:05:29 +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