Commit Graph

21381 Commits

Author SHA1 Message Date
Chinmay D. Pai
86636212c3
fix: remove make_purchase_invoice from demo script
currently demo fails with the following error:

frappe@bf54a9834cfe:/workspace/development/frappe-bench$ bench --site test1.localhost execute erpnext.demo.demo.make
Traceback (most recent call last):
  File "/usr/lib/python3.7/runpy.py", line 193, in _run_module_as_main
    "__main__", mod_spec)
  File "/usr/lib/python3.7/runpy.py", line 85, in _run_code
    exec(code, run_globals)
  File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 97, in <module>
    main()
  File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 18, in main
    click.Group(commands=commands)(prog_name='bench')
  File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 764, in __call__
    return self.main(*args, **kwargs)
  File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 717, in main
    rv = self.invoke(ctx)
  File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 956, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 555, in invoke
    return callback(*args, **kwargs)
  File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/decorators.py", line 17, in new_func
    return f(get_current_context(), *args, **kwargs)
  File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/__init__.py", line 25, in _func
    ret = f(frappe._dict(ctx.obj), *args, **kwargs)
  File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/utils.py", line 145, in execute
    ret = frappe.get_attr(method)(*args, **kwargs)
  File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 1042, in get_attr
    return getattr(get_module(modulename), methodname)
  File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 823, in get_module
    return importlib.import_module(modulename)
  File "/workspace/development/frappe-bench/env/lib/python3.7/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1006, in _gcd_import
  File "<frozen importlib._bootstrap>", line 983, in _find_and_load
  File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 677, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 728, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/demo.py", line 6, in <module>
    from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset
  File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/user/fixed_asset.py", line 9, in <module>
    from erpnext.assets.doctype.asset.asset import make_purchase_invoice, make_sales_invoice
ImportError: cannot import name 'make_purchase_invoice' from 'erpnext.assets.doctype.asset.asset' (/workspace/development/frappe-bench/apps/erpnext/erpnext/assets/doctype/asset/asset.py)

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-11 16:20:07 +05:30
Saqib
6ec4618914
fix: travis (#20903) 2020-03-11 16:04:00 +05:30
Prssanna Desai
4fd61c3f83
fix: parameters un get function for accounts dashboard (#20847) 2020-03-11 12:37:56 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register
fix: HSN code not visible in GST Itemised Purchase register
2020-03-10 10:05:31 +05:30
Deepesh Garg
74d4e9e4ea
Merge pull request #20884 from deepeshgarg007/first_row_dimension
fix: Acccounting Dimension disappearing in first row after refresh
2020-03-09 22:47:25 +05:30
Deepesh Garg
5e58666091 fix: HSN code not visible in GST Itemised Purchase register 2020-03-09 22:38:41 +05:30
Saqib
f866ed9679
fix: [pos] customer group filter resets on syncing offline invoices (#20873) 2020-03-09 18:30:47 +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
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup (#20853) 2020-03-09 18:07:43 +05:30
Deepesh Garg
8d72b14776 fix: Acccounting Dimension disappearing in first row after refresh 2020-03-09 08:06:07 +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
Marica
fc96c1a2d6
fix: update_child_qty_rate() missing argument (#20838) 2020-03-06 10:57:59 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options
feat: update profit and loss for new report summary API
2020-03-04 16:07:31 +05:30
Deepesh Garg
a75cf35bb7
Merge pull request #20755 from lokesh-indictrans/develop
fix: user is not able to do 'Set as Lost' for Quotation (#20603)
2020-03-04 11:56:52 +05:30
Deepesh Garg
6d604a151b
fix: Validation message 2020-03-04 11:55:10 +05:30
Deepesh Garg
a245a3a47f fix: HSN code no visible in GST itemised sales register 2020-03-04 10:23:49 +05:30
Lokesh Waingankar
d398c73bc5 fix: Removed html tags in pop up message (#20603) 2020-03-03 19:07:51 +05:30
Lokesh Waingankar
6795422204 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-03 12:12:56 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters (#20807) 2020-03-02 19:25:01 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports (#20803) 2020-03-02 19:10:29 +05:30
Priyanka Gangar
ca05c83796
fix: fetch sales person name (#20805)
* fix: fetch sales person name

* Update sales_person.js

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-02 19:06:06 +05:30
Deepesh Garg
cd96be9993
fix: Excel support and UX fixes for chart of accounts importer (#20703)
* fix: Excel support and UX fixes for chart of accounts importer

* fix: Linting Errors

* fix: Blank chart preview

* fix: Added template types for download

* fix: Description on template selection

* fix: Linting fixes

* fix: Move logic for download template to dialog
2020-03-02 18:57:21 +05:30
Deepesh Garg
cc2771baa7
fix: Total amount not displayed in Journal Entry (#20794)
* fix: Total amount not displayed in Journal Entry

* fix: Update paid_to_received field

* fix: set total amount

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-02 18:09:19 +05:30
Saurabh
19df2ffbd8
[bug][fix]: set status to object instead of variable (#20790) 2020-03-02 17:50:05 +05:30
Lokesh Waingankar
38242bc21f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-02 17:45:59 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Frappe PR Bot
eb2f79b16e
feat: Updated translation (#20784) 2020-03-02 16:52:42 +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
ff52d16fb3
chore: control reposting of future gl entries with flags (#20774) 2020-03-02 15:19:18 +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
Saqib
7b8c3dee3d
fix: reconciled entries showing in bank reco (#20787) 2020-03-02 15:01:06 +05:30
Deepesh Garg
09188e4a21 fix: Remove fetch from loan_application.json 2020-03-01 22:16:27 +05:30
Deepesh Garg
0c7b60aa99
Merge pull request #20768 from marination/buying-dashboard
chore: Rearranged Buying Module Dashboard
2020-02-29 17:33:51 +05:30
radhikag
86ecaa59ca fix : Student Admission accepting end date less than start date. #20625 2020-02-29 12:47:03 +05:30
Deepesh Garg
2090d113e5
Merge pull request #20781 from deepeshgarg007/loan_shortfall_enhance
fix: Add loan to value ratio in loan security type
2020-02-29 09:01:27 +05:30
Deepesh Garg
eee7f77d47 fix: Add loan to value ratio in loan security type 2020-02-29 08:58:15 +05:30
marination
24f4683999 chore: Rearranged Buying Module Dashboard 2020-02-28 12:58:41 +05:30
Deepesh Garg
5707c9a731
fix: Item Wise report query fix (#20760) 2020-02-28 12:28:54 +05:30
Karthikeyan S
0db423ed5f
fix(auto attendance): bug in marking absent (#20759)
This bug was introduces in the commit bd6e8b9cec

i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.
2020-02-28 12:27:21 +05:30
Saqib
8cf841ce60
fix: wrong calculation of depreciation eliminated for a period (#20502) 2020-02-27 19:09:34 +05:30
Lokesh Waingankar
b252f5851d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-27 19:09:14 +05:30
Lokesh Waingankar
efb6482ef6 fix: user is not able to do 'Set as Lost' for Quotation (#20689) 2020-02-27 19:08:58 +05:30
Shivam Mishra
d20e36f3fd
feat: ignore permission when deleting linked emails (#20751)
* feat: ignore permission when deleting linked emails

* fix: uncommented important snippet
2020-02-27 19:07:58 +05:30
Saqib
fb35a54bee
perf: improve gl entry submission (#20676)
* perf: improve gl entry submission

* perf: add indexes

* fix: replace **kwargs with *args

* fix: syntax error

* fix: remove cypress

* fix: travis

* chore: remove purchase invoice from status updater

* fix: set_staus args

Co-Authored-By: Nabin Hait <nabinhait@gmail.com>

* fix: only update status for invoices & fees

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:32:19 +05:30
Anurag Mishra
d42a4a6234
fix: deductions calculation based on gross pay (#20727)
* fix: deductions calculation based on gross pay

* test: salary structure deduction based on gross pay

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:31:18 +05:30
rohitwaghchaure
b5a670cdb9
fix: serial no material transfer performance issue (#20747) 2020-02-27 18:18:10 +05:30