Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,970 Commits 3 Branches 0 Tags 1 GiB
6bb920f25e
Commit Graph

4434 Commits

Author SHA1 Message Date
18alantom
308905b1be fix: semgrep, refactor default mutable dict 2021-05-04 11:46:13 +05:30
18alantom
e36f303042 fix: use percent string templates for db.sql calls 2021-05-04 11:46:13 +05:30
rohitwaghchaure
1f4df80565
Merge pull request #25531 from noahjacob/fix_mr_filter 
fix: updated item filters for material request
 2021-05-03 18:36:25 +05:30
rohitwaghchaure
88734eea14
Merge pull request #25557 from rohitwaghchaure/increased-timeout-of-stoc-reco 
fix: stock reconciliation getting time out error during submission
 2021-05-03 18:25:33 +05:30
Rohit Waghchaure
8f34ca4ac6 fix: stock reconciliation getting time out error during submission 2021-05-03 15:32:13 +05:30
rohitwaghchaure
00ea336b52
fix: stock ledger entry created against draft stock entry (#25540) 2021-05-01 13:53:39 +05:30
Nabin Hait
da0ba15cbf
fix: Fetch total stock at company in PO (#25532) 2021-04-30 18:38:41 +05:30
noahjacob
a90c81626f fix: updated item filters for material request 2021-04-30 15:49:36 +05:30
Noah Jacob
dc086dd52f
fix: item stock levels displaying inconsistently (#25506) 
* fix: fixed stock levels dashboard not displaying after any interactions

* fix: minor translation fix
 2021-04-29 11:03:27 +05:30
rohitwaghchaure
b9078a0c86
Merge pull request #25126 from rohitwaghchaure/purchase-invoice-to-purchase-receipt-develop 
feat: purchase receipt creation from purchase invoice
 2021-04-27 09:56:28 +05:30
Ankush Menat
9178d95cca
fix: can not create item variants (#25433) 
* fix: item_code assigned to function returning None

* fix: ignore has_variants and attributes in variant

* fix: patch to remove has_variants and attributes

* chore: fix whitespace in translation
 2021-04-26 15:37:17 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Nabin Hait
840c921229
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-19 13:30:19 +05:30
Deepesh Garg
cb718fce88
feat: Role to allow over billing, delivery, receipt (#24854) 
* feat: Role to allow  over billing, delivery, receipt

* fix: Typo
 2021-04-19 13:25:15 +05:30
Alan
ac8a467b0a
fix: exclude spurious Stock Entry Types from 'consumed' calculation (#25352) 
* fix: exclude spurious 'Stock Entry Type's from 'consumed' calculation

* fix: filter using purpose, make requested changes

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-04-19 12:38:25 +05:30
Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO (#25345) 
* fix: Dont fetch exchange rates for each line item once fetched at parent
`

* perf: Use price list conversion rate from parent

- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 11:05:21 +05:30
Ankush Menat
9229ee1745
fix: update shipment status in database 
Caught by semgrep rule:
https://github.com/frappe/erpnext/blob/develop/.github/helper/semgrep_rules/frappe_correctness.yml#L4
 2021-04-18 13:22:19 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Nabin Hait
eeece59a17
Merge branch 'develop' into disable_rounded_total 2021-04-16 18:44:17 +05:30
Marica
ede339f80b
fix: Serial No not updated correctly via Inter Company Stock Transfer (#25006) 
* fix: Serial No not updated correctly via Inter Company Stock Transfer

* chore: Added More Test Cases for inter company Serial Transfer

* fix: Test for serial no duplication

- fixed serial no test
- made errors more meaningful on serial no validation

* fix: Stock Reco Test

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-04-16 18:42:54 +05:30
Anupam
9d9c256e70 feat: added Disable Rounded Total in sales transactions 2021-04-16 00:11:40 +05:30
18alantom
6179cc1311 fix: make pickup_to and pickup_from mandatory fields 2021-04-15 20:36:28 +05:30
18alantom
597bb8be18 fix: remove pickup_to, pickup_from and get_pickup_time 
relies on server-side validation instead js controller
 2021-04-15 20:32:45 +05:30
rohitwaghchaure
72929aab38
Merge pull request #24878 from anupamvs/planning 
feat: add total available stock field in PO
 2021-04-15 16:28:49 +05:30
rohitwaghchaure
1bdc457777
Merge pull request #25304 from ankush/fix_sl_rounding 
fix(stock_ledger): round off values near to zero
 2021-04-15 14:44:09 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning 2021-04-15 12:48:25 +05:30
Nabin Hait
2535fe9b1e fix: Resolved merge conflict 2021-04-14 13:09:50 +05:30
Nabin Hait
1bc65ddbe4
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-14 11:23:34 +05:30
Nabin Hait
dd02b5abf1
Merge branch 'develop' into fix_sl_rounding 2021-04-14 10:36:40 +05:30
rohitwaghchaure
ce6c3b5b74
fix: incorrect incoming rate for the sales return (#25306) 2021-04-13 20:55:52 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Deepesh Garg
9aad73b9f0
Merge pull request #25195 from ankush/use_isinstance_instead_of_type 
fix: broken type check in stock ageing report
 2021-04-13 15:24:53 +05:30
Deepesh Garg
3db8ba2d4a
Merge pull request #25033 from anupamvs/se-add-to-transit 
fix: unable to submit stock entry
 2021-04-13 14:59:54 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Ankush Menat
6a014d12c1
fix(stock_ledger): round off values near to zero 2021-04-12 20:21:27 +05:30
Rohit Waghchaure
bda4c5cc52 fix: update scheduler check tim 2021-04-12 16:11:52 +05:30
Rohit Waghchaure
2339de7333 fix: update scheduler check tim 2021-04-12 16:09:55 +05:30
Marica
be26e59087
Merge pull request #25196 from noahjacob/UX 
fix: Company field in Warehouse
 2021-04-12 11:08:45 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice (#25029) 
* fix: Item wise tax rate for consolidated POS invoice

* fix: Do not alter item wise taxes for consolidated invoices

* fix: Add test case

* fix: Update

* fix: Set opening stock for test item

* fix: Add valuation rate for opening stock
 2021-04-12 10:56:47 +05:30
Marica
99522252c4
Merge branch 'develop' into UX 2021-04-12 10:51:24 +05:30
Ankush Menat
d235fc75ad
fix: remove nonexistent method from pick list (#25279) 
This method is merged in calculate_rate_and_amount() during repost item
valuation refactoring.

Ref:
e10f0a5a6c (diff-a160e3a8907dcdf28ce7728bb7dd45914ad8ab033489ea3de4c80fb1c4ca7fe9)
 2021-04-12 10:23:06 +05:30
Rohit Waghchaure
cb6494876f feat: purchase receipt creation from purchase invoice 2021-04-10 10:49:30 +05:30
Rohit Waghchaure
1358443cdb fix: patch 2021-04-10 10:42:08 +05:30
noahjacob
110f28f869 Company field editable and is readonly after saving. 2021-04-09 20:01:47 +05:30
Anupam Kumar
a91d7bd4b5
Merge branch 'develop' into se-add-to-transit 2021-04-09 18:00:03 +05:30
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning 2021-04-09 17:59:47 +05:30
rohitwaghchaure
526f76c27d
Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project 
fix: travis
 2021-04-09 17:07:22 +05:30
Rohit Waghchaure
ca5e10892c fix: travis 2021-04-09 16:23:45 +05:30
Marica
d38618fc34
Merge branch 'develop' into item-dashboard-fixes 2021-04-09 11:57:56 +05:30
Marica
5467d7c3e3
fix: Use system precision instead of SLE precision 2021-04-09 11:56:49 +05:30