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

4092 Commits

Author SHA1 Message Date
Marica
7860d9e699
Merge branch 'develop' into whitelist-query 2020-07-07 11:53:19 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
mohammadahmad1990
261ecba3d6 Company field removed from Item Taxes Table 2020-07-03 15:04:28 +05:00
mohammadahmad1990
ad3d44d622 fix: Item Tax Template check on company field 2020-07-03 15:02:39 +05:00
mohammadahmad1990
e39649bc9e fix: Item Tax Template with no validity 2020-07-03 15:02:03 +05:00
mohammadahmad1990
41c0c9f46b fix: Item Tax Template 2020-07-03 15:01:49 +05:00
Andy Zhu
b60abb0158
fix: fetch item price in sales invoice 
When create standalone sales invoice, the item price will not be created fetch.
By adding "posting_date" to dict: item_price_args, it will be fetch on building the condition of SQL.
 2020-07-03 14:13:15 +12:00
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-02 15:11:45 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-02 12:35:41 +05:30
Marica
8732b8caf6
fix: Stock Onboarding typo and reorder (#22499) 2020-06-29 17:38:42 +05:30
rohitwaghchaure
4cc2e70348
Merge pull request #22454 from wojosc/patch-10 
refactor: update customs_tariff_number.json
 2020-06-28 15:07:19 +05:30
Wolfram Schmidt
a97715e464
Update customs_tariff_number.json 2020-06-26 10:24:48 +02:00
Wolfram Schmidt
7f2a3e8c7d
Update customs_tariff_number.json 
Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.
 2020-06-25 13:56:32 +02:00
marination
f311f52f6e fix: Disable Renaming in Serial No 2020-06-25 16:02:18 +05:30
John Clarke
6fd1068af3
Update stock_ageing.py 2020-06-24 07:31:21 -06:00
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting 2020-06-24 10:23:23 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract (#22386) 
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-06-23 10:42:32 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item (#22393) 2020-06-23 10:32:51 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Deepesh Garg
ded3ab1cd7 fix: Test Cases 2020-06-22 09:40:15 +05:30
Deepesh Garg
c70eb30e7e Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting 2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb fix: Move check from Stock Settings to Company Master 2020-06-20 11:55:56 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055) 
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-19 15:33:21 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis 
fix: Travis(develop)
 2020-06-15 16:12:10 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address 
fix: Billing address in for Purchase documents
 2020-06-14 15:10:43 +05:30
Deepesh Garg
6760077674 fix: Billing address in for Purchase documents 2020-06-13 22:40:23 +05:30
John Clarke
15e4ea0472
Merge branch 'develop' into clarkejj-patch-1 2020-06-12 07:55:49 -06:00
John Clarke
85f237257a
Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case 2020-06-12 07:22:14 -06:00
Deepesh Garg
c258ac82c5 feat: Accounting entries for service item in Purchase receipt 2020-06-12 18:33:42 +05:30
John Clarke
677978dd00
Update stock_ageing.py 
As reviewer Deepesh Garg advised thanks!  batch[0] can be int of float - see line 49 - so change proposed cint to flt
 2020-06-12 05:53:24 -06:00
Alirio Castro
faf33072c8 fix: key was mispelled 2020-06-11 23:32:53 -04:00
John Clarke
6b55f66f02
Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ 
Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605
 2020-06-11 10:24:48 -06:00
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
Rohan
d60d2e1826
fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781) 
* fix: only auto-set serial nos and batches if allowed in Stock Settings

* fix: bug with setting disabled batch no in Pick List

* fix: remove auto-set batch variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-10 19:10:56 +05:30
rohitwaghchaure
3a9c1b23db
Merge pull request #22096 from marination/valuation-rate 
fix: '>=' not supported between instances of 'str' and 'int'
 2020-06-10 14:12:13 +05:30
marination
f5b9deea5b fix: Finished Product Valuation at Repack 2020-06-08 13:02:00 +05:30
Deepesh Garg
407c7bc113
Merge pull request #22067 from marination/item-attribute 
fix: Misleading Error message for Item Attribute.
 2020-06-05 11:21:08 +05:30
P-Froggy
6f87f97efe
fix: Wrong Ordered-Status Indicator for Material Request Items (#22118) 
The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status.
The qty field used in the code is not in stock uom while the ordered_qty field is.
Now, the stock_qty field is used for correct comparison with ordered_qty.
 2020-06-05 10:57:07 +05:30
marination
6f7e9d2904 fix: '>=' not supported between instances of 'str' and 'int' 2020-06-03 17:13:58 +05:30
Myuddin khatri
9276d16420 fix(stock): able to create purchase invoice from purchase receipt dashboard 
able to create purchase invoice from purchase receipt dashboard
 2020-06-03 11:22:49 +05:30
marination
0df7f0fe9d fix: Misleading Error message for Item Attribute. 2020-06-01 11:56:33 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecf.
 2020-05-30 11:38:04 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes (#21965) 
* fix: Buying Module fixes

* fix: Delete Report files as well

* fix: Add Purchase Order Analysis to Stock & Accounting
 2020-05-27 20:56:39 +05:30
Marica
a49f045d14
fix: Grammar fixes (#21970) 2020-05-27 20:28:37 +05:30
Rohan
d28854b3c2
fix: throw error if no serial numbers are found in Pick List (#21915) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-26 18:13:25 +05:30
Marica
74a910ae92
fix: title for onboarding step (#21933) 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-05-26 17:49:34 +05:30
Marica
07f305a1d6
refactor: open link in new tab (#21910) 2020-05-25 16:30:59 +05:30
Rohan
e5395c3ae8
fix: filter batches based on item and warehouse in Pick List (#21780) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 15:25:21 +05:30
Marica
dd3e52184c
fix: Added Inactive serial no status (#21848) 2020-05-22 10:48:35 +05:30
rohitwaghchaure
7978907cc8
feat: BOM template (#21262) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-21 18:10:13 +05:30
marination
7afee887a8 fix: Fetch customer into Delivery Note from Pick List 2020-05-21 13:11:48 +05:30
Nabin Hait
939441117a Merge branch 'marination-purchase-dashboard' into develop 2020-05-19 20:22:48 +05:30
Nabin Hait
e005078c0d feat: buying module dashboard and onboarding 2020-05-19 20:22:25 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-19 19:51:45 +05:30
Nabin Hait
ddec05ee07 Merge branch 'marination-stock-dashboard' into develop 2020-05-19 19:08:58 +05:30
Nabin Hait
8b686a5721 feat: stock module dashboard and onboarding 2020-05-19 19:08:30 +05:30
rohitwaghchaure
f128b1c0c5
refactor: changed the fieldtype from data to small text (#21782) 2020-05-19 19:05:42 +05:30
Marica
e50ca69bb9
Merge branch 'develop' into stock-dashboard 2020-05-19 14:39:31 +05:30
marination
658f29915a fix: PR and DN trend report charts, group by fixes 2020-05-19 13:58:13 +05:30
marination
64b36dba4f fix: Changed Form Tour order and grammar fixes. 2020-05-19 13:27:10 +05:30
marination
a5fcaf66f9 fix: Added filters in number Cards 2020-05-19 13:05:22 +05:30
Rohit Waghchaure
34f4a2398b feat: manufacturing dashboards 2020-05-18 11:57:25 +05:30
rohitwaghchaure
8e3fc5ee6e
fix: incorrect stock valuation for repack entry (#21736) 2020-05-17 20:28:39 +05:30
rohitwaghchaure
5cfbdf4bcb
fix: user not able to view product (#21740) 2020-05-15 19:36:23 +05:30
marination
be5c45a9ae chore: Fixtures and empty state handling in chart widgets 2020-05-15 13:21:58 +05:30
Saqib
41b47a68b3
fix: item price not fetching when customer is unset in item price (#21488) 
* fix: item price not fetching when customer is unset in item price

* fix: item price of selling type has hidden supplier value

* fix: remove test variable

* fix: test

* patch: invalid customer/supplier based on item price type

* fix: invalid query

* fix: patch

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-15 04:24:36 +05:30
marination
3f7678416f chore: Stock Onboarding 2020-05-15 04:13:02 +05:30
marination
bb95cd5fd8 chore: Added Dynamic Charts to DN and PR Trends Reports 2020-05-15 01:33:43 +05:30
marination
10bd2417ff feat: Custom Dashboard 'Warehouse wise Stock Value' with Chart Source 2020-05-14 15:35:18 +05:30
marination
021acd0a01 chore: Stock Ageing and Item Shortage Reports with Charts 2020-05-14 13:20:43 +05:30
Marica
97715f2877
fix: Message for missing valuation rate (#21686) 2020-05-11 20:45:37 +05:30
Deepesh Garg
ece1b4bc5a
Merge pull request #21676 from rohitwaghchaure/fixed-qty-validation-in-stock-entry 
fix: '<' not supported between instances of 'str' and 'int'
 2020-05-11 12:27:20 +05:30
Rohit Waghchaure
3a914a7cd7 fix: '<' not supported between instances of 'str' and 'int' 2020-05-11 11:44:45 +05:30
marination
65123d2adc fix: Item Barcode stays the same after updation. 2020-05-08 16:30:46 +05:30
rohitwaghchaure
8b9574d434
Merge pull request #21657 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report 
fix: local variable 'lft' referenced before assignment
 2020-05-08 15:39:24 +05:30
Rohit Waghchaure
074ea2f882 fix: local variable 'lft' referenced before assignment 2020-05-08 15:33:35 +05:30
rohitwaghchaure
9de26f6648
fix: list index out of range (#21613) 2020-05-07 12:06:47 +05:30
Marica
5e3d8050aa
fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724) 
* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Added patch, fixed tests, fixed delivery note behaviour

* chore: Added comments amd fixed typo

* fix: Added patch to patches.txt

* fix: Patch fix and simplification, json timestamp updation.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 14:37:39 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill 
chore: Commonify auto-filling warehouses in child tables
 2020-05-03 20:33:45 +05:30
rohitwaghchaure
268df35d80
Merge pull request #21516 from marination/stock-balance-cleanup 
chore: Added company filter and minor cleanup in Stock Balance Report
 2020-05-03 16:31:34 +05:30
Nabin Hait
da17f9cb05
feat: Run MRP at parent level in the production plan (#21545) 
* enhance: provision to make material request from other location

* fix: source warehouse for material transfer from production plan

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-05-01 18:16:25 +05:30
Deepesh Garg
998364d636
fix: Update timestamp 2020-05-01 12:04:13 +05:30
Deepesh Garg
6cce75a230
Revert "fix: Update in field type" 2020-05-01 12:03:18 +05:30
Deepesh Garg
e2de2923e2
Merge pull request #21420 from wojosc/patch-8 
fix: Update in field type
 2020-05-01 11:38:23 +05:30
rohitwaghchaure
be16e5cccc
fix: 'NoneType' object is not iterable (#21537) 2020-05-01 10:50:17 +05:30
marination
3568dc75be fix: Make Company the first filter 2020-05-01 00:01:37 +05:30
marination
89c41d8384 chore: Added company filter and minor cleanup in Stock Balance Report 2020-04-30 13:56:49 +05:30
Deepesh Garg
758f0f0780
Merge branch 'develop' into patch-8 2020-04-30 11:37:27 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740) 
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-30 10:38:58 +05:30
rohitwaghchaure
20fa73ff9c
Merge pull request #21388 from marination/stock-entry-form-cleanup 
chore: Stock Entry Form Cleanup
 2020-04-29 03:13:12 +05:30
marination
6c871d6bcf fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report 2020-04-28 21:28:53 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message 
fix: E-Way bill error message
 2020-04-27 15:04:32 +05:30
Wolfram Schmidt
acfe8f020f
added time stamp to commit 
added time stamp to commit
 2020-04-27 08:48:34 +02:00
Rucha Mahabal
f40a431d8c fix: delivery trip form 2020-04-27 11:29:56 +05:30
Deepesh Garg
4eecc65cff fix: E-way bill fix in Delivery Note 2020-04-27 10:50:59 +05:30
Himanshu
c9a1aa8eaa
fix: add dashboard to quality inspection template (#21423) 2020-04-26 23:28:33 +05:30
rohitwaghchaure
733b47c5e6
Merge pull request #21389 from marination/stock-entry-qty 
fix: Issues on qty trigger in Stock Entry Detail
 2020-04-26 17:59:45 +05:30
marination
de33029393 fix: Remove callback outside if condition 2020-04-26 17:16:21 +05:30
Wolfram Schmidt
64c7eeed24
Update in field type 
Warrenty Period (in Days) changed from "Data" to "Int".
 2020-04-26 10:56:08 +02:00
rohitwaghchaure
8b1c71ea44
fix: work order creation message against material request (#21413) 2020-04-26 09:38:18 +05:30
marination
e1e98fe116 fix: Issues on qty trigger in Stock Entry Detail 2020-04-23 20:18:52 +05:30
marination
f7aa6a8357 chore: Stock Entry Form Cleanup 2020-04-23 19:27:50 +05:30
rohitwaghchaure
28deddeb6f
fix: incorrect out value in stock balance due to precision issue (#21379) 2020-04-23 09:44:58 +05:30
marination
8a30cb2565 chore: Commonify autofilling warehouses in child tables 2020-04-23 00:18:21 +05:30
Nabin Hait
a529a5078f
Update purchase_receipt.json 2020-04-21 13:50:26 +05:30
Marica
bda0ddf1cf
fix: Purchase Receipt Form Cleanup (#21232) 2020-04-21 13:15:05 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX (#20810) 
* fix (ux): Material Request Form Cleanup

* fix: Get Items from popup UX

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-21 13:13:39 +05:30
Marica
9ea1ad4051
fix: Re-order Item Error Email format (#21342) 
* fix: Re-order Item Error Email format

* fix: Translated strings
 2020-04-21 12:52:29 +05:30
rohitwaghchaure
a92eaff83b
fix: scrap items order not showing correctly in stock entry (#21346) 2020-04-21 11:27:10 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions (#21313) 2020-04-18 22:13:48 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop 
fix: minor issues
 2020-04-18 02:08:26 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales (#21299) 
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
 2020-04-17 10:52:28 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes (#21296) 
* fix: Made received qty readonly and no-copy

* fix: Made release date mandatory

* fix: requested qty calculation fix for UOM
 2020-04-16 20:11:32 +05:30
Deepesh Garg
44c0c6c159
Merge branch 'develop' into asset-cat-validation 2020-04-16 11:23:52 +05:30
rohitwaghchaure
65628ac3e2
Merge pull request #21283 from marination/stock-entry-get-items-mr 
fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from
 2020-04-16 00:33:03 +05:30
marination
0b98a6296b fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from 2020-04-15 21:19:04 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer 
feat: Provision to set Default Item Manufacturer
 2020-04-15 16:35:08 +05:30
Saqib Ansari
1f20c99ecf fix: tests depending on global default company 2020-04-14 19:40:25 +05:30
Rohit Waghchaure
d0f6f1808b fix: minor issues 2020-04-14 17:26:58 +05:30
Saqib
b52cd59dc3
Merge branch 'develop' into project-link-for-all-accounts 2020-04-14 14:05:32 +05:30
Marica
3ce23858bf
Merge branch 'develop' into batch_message_v13 2020-04-13 13:20:25 +05:30
vishdha
cfaf638cc2 fix: batch message ux improved 2020-04-13 12:31:26 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation 2020-04-12 13:39:43 +05:30
Deepesh Garg
5e274965cc
Merge pull request #21201 from marination/serial-no-status 
fix: Added Status field in Serial No for filter and report builder
 2020-04-10 20:48:06 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry 
fix: Mapping Customer Provided Material Request to Stock Entry
 2020-04-09 13:18:25 +05:30
vishdha
0b34b90e71 fix: item_name added for message 2020-04-09 11:46:46 +05:30
marination
86e8b2a1c6 fix: Status field in Serial No for filter and report builder 2020-04-08 15:38:28 +05:30
Saqib
562fd0eab0
fix: purchase return are allowed even when assets are not cancelled (#20797) 
* fix: purchase return are allowed even when assets are not cancelled

* chore: test case

* fix: error message

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-08 12:11:40 +05:30
rohitwaghchaure
47c8ddb29b
Merge pull request #20962 from marination/pick-list-enhance 
fix: Pick List Enhancements
 2020-04-08 12:09:10 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces (#21192) 2020-04-08 09:32:41 +05:30
marination
3e7a8abf29 feat: Provision to set Default Item Manufacturer 
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
 2020-04-07 21:00:57 +05:30
rohitwaghchaure
36459c052f
Merge branch 'develop' into pick-list-enhance 2020-04-07 18:04:39 +05:30
rohitwaghchaure
0672b6b2e8
Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop 
fix: get serial nos based on posting date and time
 2020-04-07 18:02:49 +05:30
Nabin Hait
c9f08bed2b fix: set batch qty in batch master and test cases 2020-04-07 17:33:10 +05:30
Rohan Bansal
f92a5f32bd fix: set batch ID as title instead of item code 2020-04-07 17:33:10 +05:30
Rohan Bansal
d2d73e6cb7 fix: prioritize empty over expired as batch status 2020-04-07 17:33:10 +05:30
Rohan Bansal
ba03853b2a fix: update Batch schema 2020-04-07 17:33:10 +05:30
Rohan Bansal
ced78cf116 fix(stock): make requested changes 2020-04-07 17:33:10 +05:30
Rohan Bansal
92669eae66 fix(stock): batch list view statuses 2020-04-07 17:33:10 +05:30
Rohan Bansal
4a50c99867 fix(stock): Update batch quantity whenever stock in it is moved 2020-04-07 17:33:10 +05:30
Rohan Bansal
1bd7ea99f4 fix(batch): Only consider valid stock ledger entries 2020-04-07 17:33:10 +05:30
Rohan Bansal
658ed14e40 feat(batch): Add total quantity and dashboard to Batch 2020-04-07 17:33:10 +05:30
rohitwaghchaure
d313a239de
Merge pull request #21065 from marination/bin-requested-qty 
fix: Updated Bin Requested Qty logic
 2020-04-07 14:50:19 +05:30
Rohit Waghchaure
560f822dbf fix: get serial nos based on posting date and time 2020-04-07 14:42:02 +05:30
rohitwaghchaure
55ea142afd
Merge pull request #21181 from marination/purchase-receipt-scan-barcode 
feat: Scan Barcode in Purchase Receipt
 2020-04-07 14:36:56 +05:30
Marica
c732e9967d
fix: Validate Serial/Batch No naming series in Item itself (#21167) 
* fix: Validate Serial/Batch No naming series in Item itself

* fix: Consider '#' too
 2020-04-07 14:16:14 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance 2020-04-07 14:05:05 +05:30
rohitwaghchaure
f8e8333d77
Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop 
fix: material request type manufacture shows items with Is Purchase I…
 2020-04-07 12:06:18 +05:30
marination
e05013ede3 feat: Scan Barcode in Purchase Receipt 2020-04-06 22:13:13 +05:30
Rohit Waghchaure
5317907e15 fix: material request type manufacture shows items with Is Purchase Item enabled 2020-04-06 17:53:16 +05:30
Marica
e58d1b1b9f
Merge branch 'develop' into bin-requested-qty 2020-04-06 15:54:51 +05:30
Saqib Ansari
474222074b fix: tests 2020-04-06 12:40:41 +05:30
Deepesh Garg
aa775f87b2
fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer (#21142) 
* fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer

* fix: Use cint
 2020-04-06 10:23:06 +05:30
marination
2a9a5352bb fix: Test Cases and block expense on outward entry 
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
 2020-04-03 18:25:21 +05:30
marination
fd04e96bdd fix: Mapping Customer Provided Material Request to Stock Entry 
- Fixed inability to map Material Request to Stock Entry
- Commonified Customer Provided Item validation
 2020-04-03 15:46:48 +05:30
Marica
66c4a08703
fix: Update Received Qty in Material Request as per Stock UOM (#21054) 
* fix: Update Received Qty in Material Request as per Stock UOM

* fix: Process each PR only once

* fix: minor suggested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-03 10:07:06 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them (#21078) 
* fix: cannot set warehouse on deleting all so items and updating them

* fix: travis

* fix: docname is editable in update items dialog
 2020-04-03 10:02:56 +05:30
marination
9a39bcd031 fix: Fixed Test Cases for Material Request 
- Reduce quantity on Material Transfer/Issue
- No effect on Customer Provided Material Request
 2020-04-02 19:36:21 +05:30
marination
686a09620d fix: Commonified code and added server side validation 2020-04-02 13:51:25 +05:30
marination
6f0dc8257c fix: Typo in stock level validation in Stock Ledger 2020-04-01 11:04:14 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom 
fix: UOM fixes in Sales Order,Material Request & Production Plan
 2020-03-31 16:24:37 +05:30
Deepesh Garg
eeb9ba81d7
Merge branch 'develop' into project-link-for-all-accounts 2020-03-31 16:07:23 +05:30
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation 
feat: allow BOM to use same item as raw material (develop)
 2020-03-31 16:04:26 +05:30
rohitwaghchaure
bc415331a2
Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation 
fix: allow target warehouses to be changed for work order stock entries (develop)
 2020-03-31 15:44:13 +05:30
Saqib
25846cccbd
fix: warehouse_account_map not getting reset for diff company transac (#20995) 
* fix: warehouse_account_map not getting reset for diff company transaction

* fix: potential key errors while fetching warehouse_account_map

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-31 15:31:15 +05:30
rohitwaghchaure
86aff0de1f
fix: serial no scan not adding the serial nos in stock entry (#21083) 2020-03-31 15:26:45 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher (#21073) 
* fix: Expense account currency validation in Landed Cost voucher

* fix: Remove unused imports
 2020-03-31 10:45:32 +05:30
Deepesh Garg
a47e42c515
Merge pull request #21087 from nabinhait/item_defaults_fix_dev 
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
 2020-03-29 21:55:25 +05:30
Deepesh Garg
f9f39f5a7e
Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter 
chore: [ux] filter warehouse based on company
 2020-03-28 21:09:46 +05:30
Saqib Ansari
ed3553f795 chore: [ux] filter warehouse based on company 2020-03-28 19:12:59 +05:30
Deepesh Garg
c12a8040ef
Merge branch 'develop' into item_defaults_fix_dev 2020-03-27 21:51:00 +05:30
Nabin Hait
fe000e20e8 fix: Add item defaults based on global settings only if default company and warehouse is mentioned 2020-03-27 19:24:47 +05:30
marination
815c36a4eb fix: Updated Bin Requested Qty logic 2020-03-26 15:46:27 +05:30
Marica
38cba153b5
fix: Make shelf life mandatory in Batched Item if it has expiry date (#21044) 2020-03-26 13:29:02 +05:30
Marica
b856aae651
fix: Project field in Stock Entry Detail should be editable (#20999) 2020-03-26 13:23:49 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection (#20757) 
* feat: auto set batch no on serial no selection

* fix: dialog not shown if set warehouse selected

* fix: typo

* fix: merge conflict

* fix: callback no getting called after serial no selected

* fix: available batch qty not fetched without set_warehouse selected

* fix: item batch not synced with dialog batch table
 2020-03-26 13:18:57 +05:30
rohitwaghchaure
b6bb56e9bf
Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop 
fix: batch selection popup not coming for stock entry
 2020-03-24 16:32:21 +05:30
Rohit Waghchaure
5c1404e878 fix: batch selection popup not coming for stock entry 2020-03-24 11:40:03 +05:30
Rohan
7ea79933b3
fix: handle error handling (#20815) 2020-03-23 14:54:33 +05:30
Rohan
879c6bfb44
Merge branch 'develop' into dev-stock-entry-fg-validation 2020-03-23 14:50:02 +05:30
Deepesh Garg
f8b54bd301
Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop 
fix: stock entry qty must be positive
 2020-03-21 20:46:10 +05:30
Rohan
b7d84725e8 fix: add warehouse check for FG item 2020-03-20 18:49:11 +05:30
marination
73c8d23a79 fix: UOM fixes in Sales Order,Material Request & Production Plan 2020-03-20 17:52:28 +05:30
Rohit Waghchaure
5e4e2dbd03 fix: stock entry qty must be positive 2020-03-19 14:53:37 +05:30
Rohan
ce90848161 fix: allow target warehouses to be changed for work order stock entries 2020-03-19 13:22:58 +05:30
Deepesh Garg
dbeb77e745
fix: Unable to submit landed cost voucher (#20977) 2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
rohitwaghchaure
e4cd12506c
Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop 
fix: reserved qty for production issue for partial completion of work…
 2020-03-19 09:37:43 +05:30
Deepesh Garg
6b36fae531
Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop 
fix: shortage qty in stock projected qty report
 2020-03-19 09:33:03 +05:30
Rohit Waghchaure
dd13d0a9a9 fix: reserved qty for production issue for partial completion of work order 2020-03-19 09:29:17 +05:30
Rohit Waghchaure
cd2478a527 fix: shortage qty in stock projected qty report 2020-03-19 09:27:53 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis (#20924) 
* fix: Multiple fixes for travis

* fix: Multiple fixes for travis

* fix: Run dashboard patch if table already exists

* fix: Multiple fixes for travis

* fix: deletion of auto-created batch
 2020-03-17 17:04:18 +05:30
marination
e1f499ae1b fix: Pick List Enhancements 2020-03-17 11:47:11 +05:30
Marica
b10adbb161
fix: Item alternative must have similar fields as original item (#20796) 
* fix: Item alternative must have similar fields as orignal item

* fix: Using db.get_values and meta instead of get_value and get_doc

* fix: Made code more DRY

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 10:56:59 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord (#20886) 
* s_inv has is_pos default set as 1
 2020-03-16 17:51:00 +05:30
Saqib
de4f6901d6
fix: serial_no_selector showing for non serialized batched item (#20851) 2020-03-16 16:29:10 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card 2020-03-12 17:13:03 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Saqib
6ec4618914
fix: travis (#20903) 2020-03-11 16:04:00 +05:30
Saqib Ansari
706c239cf6 fix: remove enable_allow_cost_center_in_entry_of_bs_account 2020-03-11 15:17:10 +05:30
Saqib Ansari
91b307e7f8 fix: project link not set in accounts other than profilt and loss accounts 2020-03-11 13:59:15 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Marica
508ad51d9c
fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation (#20858) 2020-03-09 18:13:41 +05:30
Saqib
b978d79573
fix: show uom in print formats instead of stock uom (#20843) 
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
 2020-03-06 11:03:46 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup (#20772) 
* chore: Item Price and Product Bundle Form cleanup

* fix: Trailing comma
 2020-03-02 15:51:14 +05:30
Saqib
e9ac3e0d64
feat: link serial no to batch no (#20778) 
* feat: link serial no to batch no

* fix: test cases
 2020-03-02 15:02:58 +05:30
rohitwaghchaure
b5a670cdb9
fix: serial no material transfer performance issue (#20747) 2020-02-27 18:18:10 +05:30
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM (#20689) 
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228

* fix: Added condition for None purchase order and purchase receipt (#20689)

* fix: fetch last purchase rate

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 13:21:14 +05:30
abhijitkumbharInd
ba8840727a
Create a new item on Material Request showing error Item None not found. #20608 (#20731) 2020-02-26 12:48:36 +05:30
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order (#20717) 2020-02-26 11:28:08 +05:30
rohitwaghchaure
1e6788b028
fix: reorder material request not created if doctype has custom mandatory field (#20719) 2020-02-26 11:25:34 +05:30
Andy Zhu
75d9d79fac
fix: missing assign item's expense_account 
As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.
 2020-02-26 10:49:48 +13:00
Rucha Mahabal
6071313965
fix: document creation via onboarding slide (#20644) 
* fix: defaults not set in doc created via Onboarding Slide

* fix: default company not set in Supplier
 2020-02-20 12:57:21 +05:30
Deepesh Garg
23aa5c6332
Merge pull request #20643 from abhijitkumbharInd/develop 
fix: HSN/SAC Error while creating a new item and not selecting the fi…
 2020-02-19 19:23:10 +05:30
Deepesh Garg
40546d8af9
Merge pull request #20663 from marination/stock-settings-query 
fix: Set Query on warehouse fields in Stock Settings
 2020-02-19 18:57:24 +05:30
marination
120f75026f fix: Server side validation for Warehouses 2020-02-19 11:17:58 +05:30
marination
bde13b98e0 fix: Set Query on warehouse fields in Stock Settings 2020-02-18 21:35:59 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) 
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-18 12:28:41 +05:30
abhijitkumbharIND
0047fcf7ad fix: HSN/SAC Error while creating a new item and not selecting the field. #20590 2020-02-17 18:12:58 +05:30
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371) 
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order

* fix: Query with filters, UX enhancements and cleanup
 2020-02-17 15:58:08 +05:30
Himanshu Mishra
b76d2d4d98
Fix: Syntax error in get_child_warehouses 2020-02-12 13:22:05 +05:30
rohitwaghchaure
490b843ecf
Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop 2020-02-11 19:56:11 +05:30
rohitwaghchaure
3d98c59585
Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush 
fix: backflush raw material based on - Material Transferred for Manufacture
 2020-02-11 19:50:36 +05:30
vishal
998de83d48 fix: filter serial no based on batch no 2020-02-11 12:24:44 +05:30
Rohit Waghchaure
e55a927eee fix: test cases 2020-02-10 14:39:26 +05:30
ashish-greycube
121636f9bf fix: backflush raw material based on - Material Transferred for Manufacture 2020-02-10 10:49:50 +05:30
Rohit Waghchaure
f0d27528e3 fix: time out error while submitting the purchase receipt which has more than 100 serial nos 2020-02-07 14:42:33 +05:30
Deepesh Garg
d8e57d3d5a
fix: Unable to submit landed cost voucher (#20493) 
* fix: Unable to submit landed cost voucher

* fix: Test case for multiple landed cost voucher against a Purchase receipt

* fix: Test Case
 2020-02-03 18:53:34 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Deepesh Garg
565a810bf7
Merge pull request #20454 from marination/stock-ledger-qty-column 
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
 2020-01-29 09:49:55 +05:30
Deepesh Garg
b61b8d7ced
fix: Remove comma 2020-01-29 09:49:26 +05:30
marination
372c5e51d5 fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger 2020-01-28 16:04:49 +05:30
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