Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,530 Commits 3 Branches 0 Tags 1 GiB
39b5ad8e69
Commit Graph

4213 Commits

Author SHA1 Message Date
Rohit Waghchaure
39b5ad8e69 fix: patch failing because of incorrect gl entries 2021-02-23 18:35:36 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle (#24702) 
* fix(india): escape for special characters in JSON (#24695)

JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation (#24679)

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle (#24694)

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-23 16:38:52 +05:30
Anupam Kumar
b1997da488 feat: capture Rate of stock UOM in purchase (#24315) 
* feat: capture Rate of stock UOM in purchase

* fix: review changes

* added server side code

* added stock uom rate in sales transactions

* fix: review changes

* fix: resolving conflicts

* adding patch

* fix: removing patch
 2021-02-18 21:32:05 +05:30
Nabin Hait
186a045e28 fix: update qty in future sle (#24649) 
* fix: update qty in future sle

* fix: validate cancellation due to ongoing reposting

* fix: process sle against current timestamp
 2021-02-18 21:28:28 +05:30
Nabin Hait
deddcc513d fix: stock and account balance syncing (#24644) 
* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: stock and account balance syncing

* fix: minor fix
 2021-02-18 21:28:16 +05:30
Nabin Hait
f2be0805f7 fix: formatting query args (#24627) 2021-02-18 21:25:59 +05:30
rohitwaghchaure
83792ec009 fix: reposting issue with same posting date and posting time (#24570) 
* fix: reposting issue with same posting date and posting time

* Update erpnext/stock/stock_ledger.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 21:24:48 +05:30
Nabin Hait
243d59b0c3
Reposting logic fixes (#24520) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes

* fix: test fix
 2021-02-02 16:55:13 +05:30
Marica
003ae90e12
fix: Numeric/Non-numeric QI UX (#24517) 
* chore: Show 1 field each of both types of Insoections in grid view

* fix: Make QI check Numeric by default and make checkbox "Numeric"

- Reducing cognitive load
 2021-02-01 20:38:32 +05:30
Rohit Waghchaure
aeba3d311c fix: extra transferred qty has not consumed against work order 2021-01-29 12:33:09 +05:30
Nabin Hait
a6213ccd61 Merge branch 'develop' into version-13-beta-pre-release 2021-01-28 17:36:08 +05:30
Marica
7aa16bafff
Merge branch 'develop' into lcv_multicurrency 2021-01-28 13:29:36 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Marica
ed6368d782
Merge pull request #24481 from marination/stock-entry-indicator 
chore: Set Stock Entry Form Indicators in setup
 2021-01-28 13:00:24 +05:30
Marica
9e11521764
Merge pull request #24466 from marination/stock-entry-qi 
fix: Always show QI Template in Item
 2021-01-28 12:45:49 +05:30
Jannat Patel
9f8cbe9101
Material request wrong status issue (#24019) 
* fix: material request status fix

* fix: changing precision to global defaults for material request status

* fix: adding back the removed flt

* fix: sider issues fixed

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2021-01-28 12:29:52 +05:30
Marica
cc22814df5
Merge branch 'develop' into lcv_multicurrency 2021-01-28 12:15:09 +05:30
Marica
cdccf4be52
Merge branch 'develop' into stock-entry-qi 2021-01-28 12:12:03 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector (#24398) 
* feat: feat: Provision to disbale serial no and batch selector

* fix: Sider issues

* fix: Linting issues
 2021-01-28 12:09:35 +05:30
Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing (#24470) 
* feat: Batch wise item pricing

* fix: Rate for items with no batch

* fix: Add test case for batch pricing

* fix: Sider Issues

* fix: Add item filter for batch
 2021-01-28 12:05:57 +05:30
marination
27bac2aaec fix: Missing semi-colon 2021-01-28 12:04:14 +05:30
marination
bc370b3ee5 chore: Set Stock Entry Form Indicators in setup 
- Makes it easier to override via customisations
- Style consistency with other forms that set indicator in setup as well
 2021-01-28 11:44:26 +05:30
Marica
ea7c2dbfaf
Merge branch 'develop' into stock-entry-qi 2021-01-28 11:31:43 +05:30
Deepesh Garg
a0d61524c1 fix: Add distribute manually option in LCV 2021-01-26 17:05:00 +05:30
Deepesh Garg
224fdf34e4 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2021-01-25 22:16:02 +05:30
marination
b0ef8fb7c5 fix: Always show QI Template in Item 2021-01-25 21:00:24 +05:30
rohitwaghchaure
fa3ec3c346
Merge pull request #23969 from marination/putaway 
feat: Putaway
 2021-01-25 16:42:04 +05:30
Suraj Shetty
0c34a711eb Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release 2021-01-25 16:06:38 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency 2021-01-25 12:39:16 +05:30
Afshan
96edfd93c9 fix: stock ageing should not take cancelled stock entries. 2021-01-21 18:22:35 +05:30
Deepesh Garg
60a8ba5cbd Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2021-01-20 10:30:52 +05:30
marination
957615bec8 fix: Stricter validations 
- Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation
- Every incoming stock transaction must be checked to avoid overcapacity
- However application of rule and splitting only on certain doctypes
- Validate capacity < stock balance on save in putaway rule, irrespective
 2021-01-18 23:47:24 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway 2021-01-18 17:47:25 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Marica
17614c9860
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-14 13:02:45 +05:30
marination
814858061f fix: test for raising MR-SE mismatch error 
- Make test add mismatched item code instead of warehouse, since warehouse can be different.
 2021-01-14 12:13:08 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187) 2021-01-13 21:13:12 +05:30
Marica
b8c5cd7331
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-12 20:16:58 +05:30
Marica
30cc040d50
Merge branch 'develop' into batch-selector 2021-01-12 20:14:35 +05:30
Anupam
c53ad88503 fix: resolved commit 2021-01-12 10:51:29 +05:30
Marica
aef71a8abe
Merge branch 'develop' into batch-selector 2021-01-11 14:22:11 +05:30
marination
7646d7b741 fix: Batch/Serial Selector for Batched Item 2021-01-11 12:51:15 +05:30
Marica
b9d5ae9285
Merge branch 'develop' into qi-ux 2021-01-08 20:28:28 +05:30
marination
b7637f49cd fix: Remove QI link on cancel wherever same QI name exists 2021-01-08 18:35:49 +05:30
marination
c4963bfdb2 fix: Back Update from QC based on Batch No 2021-01-08 09:56:04 +05:30
marination
ff6ee9d4e7 fix: Formula field description and Rearrange grid view 
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
 2021-01-08 09:14:43 +05:30
Marica
d91c7e2b38
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-07 15:41:21 +05:30
Marica
eab1867235
Merge branch 'develop' into qi-ux 2021-01-05 14:23:05 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes (#24282) 2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30