marination
32f3d24dac
fix: Employee benefit application & quality inspection whitelist
2020-07-07 14:31:49 +05:30
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