Commit Graph

29399 Commits

Author SHA1 Message Date
Rucha Mahabal
2fa204d8be fix: render_template for subject in Email Campaign (#19772) 2019-12-02 16:26:10 +05:30
Anurag Mishra
957a6f5bd5 fix: UX/UI (#19753) 2019-12-02 14:44:17 +05:30
Deepesh Garg
191aed9ace
Merge pull request #19766 from deepeshgarg007/avaiable_stock_for_packing
fix: Available stock for packing item report
2019-12-02 11:56:44 +05:30
deepeshgarg007
f89b172202 fix: Available stock for packing item report 2019-12-01 21:53:32 +05:30
Wolfram Schmidt
5249a6348f Update de.csv (#19755)
Changed all translations from "Aufgabe" to "Vorgang" in singular and plural where the word "Task" is project related. Left all agricultural and others how they are (as Aufgabe).
2019-12-01 10:47:21 +05:30
Deepesh Garg
98a54355ae fix: Post GL entry fix for asset (#19751) 2019-12-01 10:06:16 +05:30
gavin
053d9ffe86
Merge pull request #19750 from gavindsouza/set-request-util
chore: updated import paths for test utils
2019-11-30 18:22:23 +05:30
Gavin D'souza
5e217c698f Merge branch 'set-request-util' of github.com:gavindsouza/erpnext into set-request-util 2019-11-29 20:30:03 +05:30
Gavin D'souza
23b1dae6a7 chore: dropped dead setup_wizard test
fix: fixed imports for teste utils
2019-11-29 20:22:06 +05:30
Nabin Hait
d1b1156b8c
Merge branch 'develop' into set-request-util 2019-11-29 18:49:34 +05:30
Victor Munene
b3af2adc4a use program.courses instead of get_all_children to get course list (#19695) 2019-11-29 18:12:13 +05:30
Anurag Mishra
935517d914 fix: added bank reconciliation page in the accounting module (#19719)
* fix: added bank reconcilation page inaccounting module

* Update accounts.py
2019-11-29 18:08:42 +05:30
Sammish Thundiyil
54694dd816 modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json (#19470) 2019-11-29 18:00:30 +05:30
Gavin D'souza
611d2ccd04 chore: updated path for set_request in v13-develop 2019-11-29 17:42:32 +05:30
Anurag Mishra
10017c14f3 feat: HSN Code wise Item Tax (#19478)
* feat: HSN Code wise Item Tax

* feat: enqueued task of updating all items
2019-11-29 17:33:10 +05:30
Raffael Meyer
0de066c3b1 feat(regional): Add master data to DATEV Export (#18755)
* Add master data to export

* add SQL statements to get customers and suppliers

* make data category a string

* fix SQL error

* fix SQL errors

* unique column names

* add encoding of constants

* get customer primary address and contact

* fix typo

* fix typo

* binary response

* add filename

* add filecontent

* rename account columns

* exclude account groups

* use compression, close file before transfer

* fix StringIO

* add basic tests

* fix assertion, merge test methods

* fix indentation

* relative import of constants

* fix path

* import os

* Add default currency to test company

* root accounts with parent = null

* move account-related things to setup()

* add: test headers

* company and filters become class properties

* add: test csv creation

* (fix): add missing account

* (fix): remove wrong space

* add items to sales invoice

* refactor: create test data

* fix: create cost center

* fix: doctype Accoutn

* fix: make sure account belongs to company

* fix: remove customer group and territory, save on a new line

* create default warehouses

* fix: make Item myself

* fix: item defaults are a list

* fix: use my own warehouse

* fix: use my own expense account

* fix: let you take care of the Sales Invoice Item

* fix: import zipfile

* add TODOs

* fix: workaround for pandas bug

* SQL: utf-8 everywhere to make conversion in tests unnecessary

* tests: zipfile must be encoded string

* fix(tests): invalid start byte

* fix(test): give is_zipfile() the file-like object it expects

* fix(test): fix encoding of colums

* fix(get_transactions): as_dict is 1 by default

* fix(tests): allow empty data

* refactor: rename columns in get_account_names

* fix(pandas): keep sorting columns

* fix: "lineterminator" must be a string

* fix(test): check if cost center exists

* fix: credit limit became a child table

* fix: save company after creation

* insert instead of save

* tests: setup_fiscal_year

* fix(test): import cstr

* fix(tests): fiscal year

* fix: can't concat str to bytes

* fix: make csv-encoding work for py2 and py3

* fix(test): use frappe.as_unicode instead of unicode

* fix: use BytesIO instead of StringIO for py3 compatibility

* fix(tests): use BytesIO instead of StringIO for py3 compatibility
2019-11-29 17:32:17 +05:30
Prasad Ramesh
750b3a5946 fix: Button label case (#19706)
Json -> JSON
2019-11-29 17:30:46 +05:30
Saqib
98627f46f6 fix: remove asset movement mandatory fields (#19670)
* fix: pending on review date (#19609)

* fix: On Specific case if no item code in name

* fix: pending on review date

* feat: fetch leave approver from both employee and department approvers (#19613)

* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers

* fix(expense claim): fetch outstanding documents based on party account type

* fix: not able to select item in sales order

* fix: code cleanup

* fix: asset movement ux fixes (#19641)

* fix: Multiple fixes related to landed cost accounting (#19656)

* fix: last purchase rate greater than selling price

* Fixed Asset Refactor Review fixes (#19665)

* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649

* fix: remove asset movement mandatory fields

* fix: label for reference doctype
2019-11-29 17:29:38 +05:30
Khushal Trivedi
e3c05290c8 fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req (#19691) 2019-11-29 17:00:09 +05:30
Deepesh Garg
06a6fa4cfc feat: Accounts Payable report based on payment terms (#19672) 2019-11-29 16:56:27 +05:30
Saqib
20c31dd579 fix: tax templates from all companies fetching in receipt (#19682)
* fix: tax templates from all companies fetching in receipt

* Update purchase_receipt.js
2019-11-29 16:55:10 +05:30
rohitwaghchaure
d76529e6ca
Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix
fix: Serial no validation against sales invoice
2019-11-29 16:34:58 +05:30
rohitwaghchaure
c9afe2f707
Merge pull request #19602 from Anurag810/bom-explorer-report-fix
fix: Raw material qty depending on the quantity of the parent BOM
2019-11-29 16:18:30 +05:30
deepeshgarg007
c51dd2989e fix: Validation msg 2019-11-29 15:56:16 +05:30
deepeshgarg007
45f57f273c fix: Serial no validation against sales invoice 2019-11-29 15:56:08 +05:30
rohitwaghchaure
b59a25b02b
Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:29:31 +05:30
Rohit Waghchaure
bf8fe06f86 fix: please specify customer error in sales invoice if patient is blank 2019-11-29 14:14:11 +05:30
Suraj Shetty
9d6d95c4a2 fix: valuation of "finished good" item in purchase receipt (#19268)
* fix: Remove redundant purchase orders and unwanted condition

* fix: [WIP] Purchase receipt value

* fix: Add raw material cost based on transfered raw material

* fix: get_qty_to_be_received

* fix: Remove debugger statement

* fix: Reset rm_supp_cost before setting subcontracted raw_materials

* test: Fix and modify tests for backflush_based_on_stock_entry

* fix: Add non stock items to Purchase Receipt from Purchase Order

* fix: Ignore valuation rate check for non stock raw material

* fix: Rename check all rows

* fix: Remove amount from test

* test: Fix item rate error

* fix: handling of serial nos in backflush

* fix: Add serial no. of raw materials

* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material

* fix: Raw material batch number selection in purchase receipt

* Update test_purchase_order.py
2019-11-29 13:26:52 +05:30
Marica
8f48896261 fix: Permission issue in Stock Entry (#19738) 2019-11-28 19:39:49 +05:30
Anurag Mishra
f3b393f5e0 fix: UOM was not fetching in purchase invoice (#19732)
* fix: UOM was not fetching in purchase invoice

* fix: Changes requested

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 18:52:16 +05:30
Deepesh Garg
7cdde93645 fix: Validation for parent cost center (#19664)
* fix: Validation for parent cost center

* fix: Minor modification in condition

* fix: Update test cases for invalid cost center creation
2019-11-28 18:37:51 +05:30
Joseph Marie Alba
5c2ba0ef9c Fix: Logic bug (#19692)
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)]
  - if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group.
  - should be if accounts[d]['is_group'] not in ('', 0)

However, the correction provided here:

    account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1]

is more consistent with the prior statement that extracts ledger (and not group) accounts.
    account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]
2019-11-28 18:33:20 +05:30
Deepesh Garg
9f3276046f fix: Account type in Handling Difference in Inventory account (#19674)
* fix: Account type in Handling Difference in Inventory account

* fix: Add Stock Adjustment account

* fix: Rename account to stock adjustment
2019-11-28 18:29:33 +05:30
Saqib
707b83940a fix: due date before posting date for items added to cart yesterday (#19681) 2019-11-28 18:27:17 +05:30
Marica
bcd02069ea fix: Validation for Suppliers in SO to PO (#19686)
- Check if there is a Supplier against atleast one item in Sales Order
- Validation message earlier was vague
2019-11-28 18:23:45 +05:30
Marica
aff678e376 fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702) 2019-11-28 18:20:48 +05:30
Shivam Mishra
2512962f55 fix: handle None case for get_shipping_amount_from_rules (#19723) 2019-11-28 16:46:58 +05:30
Marica
f51ccbf5d4 chore: Added Quick Stock Balance to Stock Module (#19726)
- Also 'Stock Balance Report' button no longer primary button
2019-11-28 16:44:46 +05:30
rohitwaghchaure
1511154aa8 fix: removed stock value and account balance out of sync validation (#19729)
* fix: revert value out of sync feature

* fix: removed stock value and account balance out of sync validation
2019-11-28 16:43:39 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard
feat: Slides for Onboading Wizard in ERPNext
2019-11-28 14:35:10 +05:30
Deepesh Garg
2d840ab151
Merge pull request #19717 from deepeshgarg007/set_expired_sattus
fix: Path for quotation expiry method in hooks
2019-11-28 12:23:58 +05:30
deepeshgarg007
2fe0c98772 fix: Path for quotation expiry method in hooks 2019-11-28 08:09:47 +05:30
gavin
638abca498
Merge pull request #19571 from gavindsouza/updated-requirements
chore: pinned requirements
2019-11-27 20:27:27 +05:30
gavin
9629bec6e3
Merge branch 'develop' into updated-requirements 2019-11-27 19:38:47 +05:30
Anurag Mishra
707bb2052c fix: Employee dashboard disappear after switching from leave application form (#19690) 2019-11-27 16:27:50 +05:30
Marica
f0e87f7fdd fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693) 2019-11-27 15:49:41 +05:30
Gavin D'souza
7331964803 fix(travis): add lib cups for updated frappe requirements 2019-11-27 14:55:57 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c fix: moved slide json files to respective modules 2019-11-26 18:46:17 +05:30
Rucha Mahabal
3f8c460584 feat: moved slide action functions from onboarding utils to doctypes 2019-11-26 15:22:45 +05:30