Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,671 Commits 3 Branches 0 Tags 1 GiB
ec24afb283
Commit Graph

21855 Commits

Author SHA1 Message Date
sahil28297
4c3679ba8a
fix: develop version as 12.0.0-dev 2020-03-20 15:38:52 +05:30
sahil28297
fcdc2b1815
fix: develop version as 12.0.0.dev 2020-03-20 15:20:28 +05:30
sahil28297
54cbff9e80
fix: develop version as 12.x.x instead of 12.2.0 2020-03-20 14:23:27 +05:30
Suraj Shetty
3cf0dc966c fix: Add currency in options of Opportunity Amount 
- To show currect symbol in list view
 2020-03-20 12:51:16 +05:30
Rohit Waghchaure
5e4e2dbd03 fix: stock entry qty must be positive 2020-03-19 14:53:37 +05:30
Rohan
ce90848161 fix: allow target warehouses to be changed for work order stock entries 2020-03-19 13:22:58 +05:30
Deepesh Garg
dbeb77e745
fix: Unable to submit landed cost voucher (#20977) 2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop (#20987) 
* fix: Multiple fixes during pre-release testing

* fix: Merge conflict
 2020-03-19 10:59:32 +05:30
Deepesh Garg
9476170b09
Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop 
fix: bom comparison issue
 2020-03-19 10:55:14 +05:30
Rohit Waghchaure
d9469137cc fix: bom comparison issue 2020-03-19 10:07:27 +05:30
rohitwaghchaure
e4cd12506c
Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop 
fix: reserved qty for production issue for partial completion of work…
 2020-03-19 09:37:43 +05:30
Deepesh Garg
6b36fae531
Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop 
fix: shortage qty in stock projected qty report
 2020-03-19 09:33:03 +05:30
Rohit Waghchaure
dd13d0a9a9 fix: reserved qty for production issue for partial completion of work order 2020-03-19 09:29:17 +05:30
Rohit Waghchaure
cd2478a527 fix: shortage qty in stock projected qty report 2020-03-19 09:27:53 +05:30
Prssanna Desai
b4909b8fd2
fix: set filters as argument filters if passed (#20975) 2020-03-18 18:23:38 +05:30
Marica
508ed1e121
fix: Missing if condition in Customer Default Bank Account Validation. (#20969) 2020-03-18 11:28:04 +05:30
marination
3251dcf672 fix: Added patch to patches.txt 2020-03-18 10:11:23 +05:30
Rucha Mahabal
0eeaad8ce7 fix: create fee validity for new patients only 2020-03-17 20:26:29 +05:30
Rucha Mahabal
2d785b7b09 fix: invoicing logic for appointments 2020-03-17 20:18:16 +05:30
Priyanka Gangar
2602c7ea38
Label changes in account settings develop (#20965) 
* fix: Account setting words switches to US Terminology

* created united_states.js

* Remove Unwanted Spaces

* Remove all changes

* Add spaces between arguments

Co-authored-by: PriyankaGangar <pinka0925@gmail.com>
 2020-03-17 19:39:30 +05:30
Rucha Mahabal
f2574dde37 fix: set fee validity start date and set status as Completed or Pending 2020-03-17 19:28:18 +05:30
Rucha Mahabal
2f2c09bd98 fix: wrong fee validity calculation and payment fields visibility in appointment 2020-03-17 18:10:39 +05:30
Deepesh Garg
745897c354
Merge pull request #20862 from alyf-de/skr04_groups 
fix(accounts): adjust account groups in SKR04
 2020-03-17 17:27:16 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis (#20924) 
* fix: Multiple fixes for travis

* fix: Multiple fixes for travis

* fix: Run dashboard patch if table already exists

* fix: Multiple fixes for travis

* fix: deletion of auto-created batch
 2020-03-17 17:04:18 +05:30
rohitwaghchaure
06dc6a527e
fix: bom replace tool issue (#20842) 2020-03-17 17:01:26 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts (#20913) 
* fix: Party name in Statement Of Accounts

* Update general_ledger.html

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 17:00:06 +05:30
marination
e1f499ae1b fix: Pick List Enhancements 2020-03-17 11:47:11 +05:30
Deepesh Garg
e7aefc1163 fix: Add check to skip PR in supplier master 2020-03-17 11:44:02 +05:30
Deepesh Garg
eeb1922e37 fix: Add check to skip SO and DN in customer master 2020-03-17 11:43:34 +05:30
Marica
b10adbb161
fix: Item alternative must have similar fields as original item (#20796) 
* fix: Item alternative must have similar fields as orignal item

* fix: Using db.get_values and meta instead of get_value and get_doc

* fix: Made code more DRY

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 10:56:59 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension (#20860) 
* feat: Nested set filtering for accounting dimension

* fix: Remove print statement
 2020-03-17 10:53:24 +05:30
Deepesh Garg
d1bc74d650
Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix 
fix: Mode of payment not fetcched in Item wise purchase register
 2020-03-16 22:43:09 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection (#20818) 2020-03-16 22:36:44 +05:30
Deepesh Garg
07116c7922 fix: Mode of payment not fetcched in Item wise purchase register 2020-03-16 22:36:32 +05:30
Frappe PR Bot
b8b5fa6291
feat: Updated translation (#20954) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-03-16 17:59:42 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord (#20886) 
* s_inv has is_pos default set as 1
 2020-03-16 17:51:00 +05:30
Anurag Mishra
c0b1c372a4
fix: local variable 'benefit_amount' referenced before assignment (#20949) 2020-03-16 16:53:03 +05:30
Saqib
de4f6901d6
fix: serial_no_selector showing for non serialized batched item (#20851) 2020-03-16 16:29:10 +05:30
Deepesh Garg
0a74261a94
Merge pull request #20920 from deepeshgarg007/c_form_fix 
fix: Get invoice details only if invoice is selected
 2020-03-16 15:56:32 +05:30
Deepesh Garg
d190cc0198
Merge pull request #20835 from Thunderbottom/welcome-email-fix 
fix: use ERPNext in welcome email when default company is not set
 2020-03-16 15:54:53 +05:30
Prssanna Desai
e71153cbee
fix: fix options of currency fieldtype in Expense Taxes and Charges (#20901) 2020-03-16 15:52:25 +05:30
Raffael Meyer
1433436670
fix(accounts): add account_type and tax_rate to some VAT accounts (#20940) 
* Add account_type and tax rate to some VAT accounts

* fix indentation
 2020-03-16 15:45:05 +05:30
Himanshu Warekar
841be6713b Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-03-13 19:40:00 +05:30
Rucha Mahabal
cd31996b81 fix: check fee validity in a single function 2020-03-13 15:39:31 +05:30
Deepesh Garg
0b7acc0fd6 fix: Create Item tax template only for specific account types 2020-03-13 11:51:14 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor 2020-03-12 19:44:27 +05:30
Shivam Mishra
c06ba54f1e
refactor: remove website (#20927) 2020-03-12 18:04:42 +05:30
Rucha Mahabal
05853efeb7 feat: Healthcare Domain Workspace with chart and shortcuts 2020-03-12 17:44:46 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card 2020-03-12 17:13:03 +05:30
Shivam Mishra
f241054c6c feat: extended settings page 2020-03-12 16:38:59 +05:30
Shivam Mishra
05d74bbcf9 feat: added loan management page 2020-03-12 16:38:49 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Myuddin khatri
b9631a501f fix(shopping-cart): setting billing and shipping address 
setting billing and shipping address
 2020-03-12 16:21:38 +05:30
Myuddin khatri
4635ff9368 fix(shopping-cart): address is made mandatory to place order 2020-03-12 14:45:08 +05:30
Ronel Cabrera
fcb54762a1 feat(Contacts): select billing contact for sales invoice 2020-03-12 16:58:59 +08:00
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor 2020-03-12 12:52:38 +05:30
Rucha Mahabal
06d1b047e0 refactor: Healthcare Module Page 2020-03-12 12:16:23 +05:30
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
4b20e852ea fix: Get invoice details only if invoice is selected 2020-03-10 10:36:05 +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
Rucha Mahabal
c4b2dceb01 feat: Fee Validity status (Ongoing, Expired, Completed) 2020-03-09 23:57:00 +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
Rucha Mahabal
27512c86ae refactor: Healthcare utils 2020-03-09 17:29:23 +05:30
Deepesh Garg
8d72b14776 fix: Acccounting Dimension disappearing in first row after refresh 2020-03-09 08:06:07 +05:30
Raffael Meyer
f669f30c08 add missing equity accounts 2020-03-06 16:17:06 +01:00
Deepesh Garg
1943fb0de4 feat: Allow PI creation without PO 2020-03-06 18:50:11 +05:30
Raffael Meyer
7b7513ab2b adjust groups 2020-03-06 12:32:49 +01:00
Rucha Mahabal
b754faa59c fix: merge branch healthcare_refactor 2020-03-06 13:23:40 +05:30
Rucha Mahabal
e8bbdd5e84 fix: Lab Test Template data import failing in Lab Test Item creation 2020-03-06 13:18:56 +05:30
Rucha Mahabal
ac4199f2d7 fix (Lab Test): None TypeError in Patient Medical Record 2020-03-06 12:22:55 +05:30
Rucha Mahabal
11117810c5 fix (Vital Signs): Patient Medical Record not found 2020-03-06 12:21:18 +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
Chinmay D. Pai
612e58dca8
fix: use ERPNext in welcome email when default company is not set 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-03-05 10:08:43 +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
Rucha Mahabal
5eb42409c7
Merge branch 'develop' into healthcare_refactor 2020-03-03 09:22:11 +05:30
Rucha Mahabal
33fec1df54 feat: Patient Registration Web Form 2020-03-03 01:13:58 +05:30
Rucha Mahabal
77e84dfc35 fix: remove deprecated Appointment Analytics Tree Grid Report 2020-03-03 00:25:50 +05:30
Rucha Mahabal
5a92b3fc99 feat: set chart for Appointment Analytics 2020-03-03 00:24:43 +05:30
Rucha Mahabal
85aab34421 feat: Patient Appointment Analytics Script Report 2020-03-02 23:14:30 +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
Rucha Mahabal
9565e62e3a refactor: Clinical Procedure code 2020-03-02 12:11:38 +05:30
Rucha Mahabal
75626d63aa fix: set consumable entries on client side and not on validate 2020-03-02 11:35:59 +05:30
Rucha Mahabal
5ec7b55c3c fix: consumable total amount not set in Clinical Procedure 2020-03-02 10:17:15 +05:30
P-Froggy
f1014bb978 Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop 2020-03-02 00:21:12 +01:00
P-Froggy
313efe9b32 fix: add missing semicolon 2020-03-02 00:21:08 +01:00
P-Froggy
3bf04154b1
Merge branch 'develop' into develop 2020-03-02 00:18:23 +01:00
Deepesh Garg
09188e4a21 fix: Remove fetch from loan_application.json 2020-03-01 22:16:27 +05:30
Rucha Mahabal
7c5947f041 fix: Batch not getting fetched in Clinical Procedure Item 2020-03-01 14:46:34 +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
P-Froggy
f9b3e4be78 Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop 2020-02-28 20:46:41 +01:00
P-Froggy
266e689c4f fix: Show swift number and branch code in quick entry of bank doctype 2020-02-28 20:46:36 +01:00
P-Froggy
393a626834 fix: Allow only bank accounts of the respective party in payment entry 2020-02-28 20:45:48 +01:00
Rucha Mahabal
d244ac9c3a fix: status inconsistencies in Clinical Procedure 2020-02-28 19:25:26 +05:30
Rucha Mahabal
0ed4cabb5d fix: make Clinical Procedure submittable 2020-02-28 19:24:38 +05:30
P-Froggy
55d10f77f9 fix: Add linked bank accounts to supplier dashboard 2020-02-28 13:14:11 +01:00
Rucha Mahabal
d76908d757 fix: Clinical Procedure Template code refactor 2020-02-28 13:30:43 +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
Rucha Mahabal
8c5725c799 fix: change item_code from Link to Data to avoid item not found error 2020-02-27 17:18:52 +05:30
Deepesh Garg
d8d453d7d4
Merge pull request #20748 from deepeshgarg007/bank_reco_jv 
fix: Journal Entry not being fetched in Bank Reconciliation
 2020-02-27 16:18:27 +05:30
Deepesh Garg
f444f451ac fix: Remove debug statement 2020-02-27 16:04:01 +05:30
Deepesh Garg
50b3472eba fix: Journal Entry not being fetched in Bank Reconciliation 2020-02-27 16:01:47 +05:30
Rucha Mahabal
61203b8701 fix: disabled Procedure Template shown as enabled in List View 2020-02-27 13:47:54 +05:30
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM (#20689) 
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228

* fix: Added condition for None purchase order and purchase receipt (#20689)

* fix: fetch last purchase rate

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 13:21:14 +05:30
Rucha Mahabal
99321cd538 fix: conflicts 2020-02-27 13:16:53 +05:30
Rucha Mahabal
e29d5c1d5b fix: Schedule Admission button not visible 2020-02-27 12:57:38 +05:30
Saqib
dd374ff77b
fix: only update items if rate or qty changed (#20742) 2020-02-27 12:51:31 +05:30
Rohan
d40a5d92c2
fix: sort Issues chronologically (#20741) 2020-02-26 18:54:14 +05:30
Marica
62ba320f5b
fix: Lock stock ledger entries that are being reposted. (#20737) 
- If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.
 2020-02-26 18:51:13 +05:30
Deepesh Garg
fe18b92b61
fix: Mandatory bank account error fix (#20733) 
* fix: Mandatory bank account error fix

* fix: SQL condition
 2020-02-26 17:17:02 +05:30
Rucha Mahabal
a61bf44328 feat: capture symptoms, diagnosis in Table Multiselect instead of Small Text 2020-02-26 17:11:19 +05:30
Deepesh Garg
c88a7f8317 fix: User permission for Loan repayment doctype 2020-02-26 16:49:58 +05:30
Rucha Mahabal
22351adac5 refactor: Patient Encounter 2020-02-26 16:05:43 +05:30
Anurag Mishra
773e7debb9
fix: validated leave allocation (#20636) 
* fix: validated leave allocation

* fix: changes requested

* Update erpnext/hr/doctype/leave_encashment/leave_encashment.py

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

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-26 14:50:57 +05:30
Nabin Hait
2bd6ac56c6
Merge branch 'develop' into develop 2020-02-26 13:21:38 +05:30
Deepesh Garg
9f4b46050f
Merge pull request #20732 from deepeshgarg007/loan_security_pledge_api 
fix: API fix for loan security pledge creation
 2020-02-26 12:59:13 +05:30
Deepesh Garg
b5c5bdd671 fix: API fix for loan security pledge creation 2020-02-26 12:57:05 +05:30
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule (#20712) 2020-02-26 12:51:46 +05:30
abhijitkumbharInd
ba8840727a
Create a new item on Material Request showing error Item None not found. #20608 (#20731) 2020-02-26 12:48:36 +05:30
Deepesh Garg
5a2f22258a
Merge pull request #20592 from byugandhara/develop 
fix: Changes done to get valid customer and employee list on payment entry form(#20498)
 2020-02-26 12:17:47 +05:30
abhijitkumbharInd
12bc43e495
fix: Education | Quiz accepting duplicate question #20622 (#20708) 2020-02-26 12:04:41 +05:30
sharmatripti
08fa7590ef
fix: Employee field should be filtered based on department on doctype Instructor (#20705) 
* Fix: Filtered Employee based on Department on Instructor doctype (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* fix :  Filtered Employee based on Department on Instructor doctype (#20704)
 2020-02-26 12:02:37 +05:30
Rucha Mahabal
63d987f345 fix: fields fetched incosistently from appointment and patient 2020-02-26 11:59:37 +05:30
RJPvT
10aab65338
fix: smaller then instead of bigger then :-( dumb mistake vdevelop #20693 (#20702) 2020-02-26 11:59:10 +05:30
Saqib
3957ac1408
perf: search for customer's return invoices then filter out gl_entries (#20709) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-26 11:36:55 +05:30
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order (#20717) 2020-02-26 11:28:08 +05:30
Mangesh-Khairnar
99d89d6cb8
fix(HR): show correct closing leave balance (#20723) 2020-02-26 11:26:07 +05:30
rohitwaghchaure
1e6788b028
fix: reorder material request not created if doctype has custom mandatory field (#20719) 2020-02-26 11:25:34 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting (#19035) 
* fix: Create Loan Management module

* fix: Move loan doctype for hr module to loan management

* fix: Add loan dashboard

* fix: Move loan application form hr module to loan management

* fix: Move Loan Type from hr to loan management

* fix: Move salary slip loan from hr to loan management

* fix: Create loan security pledge doctype

* fix: Create loan security type doctype

* fix: Create Loan security doctype

* fix: Add customer in loan_common.js

* fix: Import patch for loan

* fix: Add security pledging in loan doctype

* fix: Add loan application pledge doctype

* fix: Add logic for security pledgeing in loan

* fix: Add logic for security pledging in loan application

* fix: Rename Loan security doctype to Loan Security Pledge

* fix: Add doctype for loan security

* fix: Fixes in loan and loan application

* fix: Add doctypes for loan repayment

* fix: Fixes in loan and loan application

* fix: Move loan repayment report from HR module to loan management

* fix: Create doctype for loan security price

* fix: Create doctype for loan security shortfall

* fix: Make fields in Loan shortfall readonly

* fix: Make loan type submittable

* fix: Add daily job for loan security revaluation in hooks.py

* fix: Add loan management module

* fix: Doctype for loan disbursement Entry

* fix: GL entry fix for loan disbursement

* fix: Add company currency options in Loan related doctypes

* fix: Changes in Loan Doctypes

* fix: Allow miltiple loan securities in Loan Security Pledge

* fix: Add proposed pledges in Loan Application

* fix: Add test cases for loan

* fix: Interest Accrual Entry for loans

* fix: Remove loan from journal entry

* fix: Update triggers in loan_common.js

* fix: Accrual Entries for loan Interest

* fix: Proposed Pledges for loan application

* fix: Update items in loan management module

* fix: Allow multiple disbursements against a loan

* fix: Add loan security code in loan security master

* fix: Allow multiple securities in a single pledge

* fix: Spelling and label fixes

* fix: Replace date in loan security price with datetime

* fix: Add dashboard to loan master

* fix: Move Repayment Schedule from HR to Loan Management

* fix: Add back jobs for loan accrual entries

* fix: Multiple fixes in loan

* fix: Multiple fixes in loan application

* fix: Loan Reapayment for term loans

* fix: Interest Accural Entries for term loans

* fix: Changes in Loan Doctypes

* fix: Add test case for term loan repayment

* fix: Add custom button to update loan security price and trigger shortfall

* fix: Usability fixes in Loan management

* fix: Multiple usablity and doctype fixes

* fix: Muliple bug and usability fixes in loan

* fix: Test case fixes for loan repayment from Salary

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Minor fix in validate_repayment_method

* fix: Test case and codacy fixes

* fix: Provide consistent naming series to loan doctypes

* fix: Loan Application fix

* fix: Loan Application Dashboard

* fix: Add doctypes to process loan interest accural and loan security price

* fix: Provision to make loan topup

* fix: Pledge and unpledge statuses and doctype for loan securit unpledge

* fix: Multiple fixes in Loan Cycle

* fix: Add missing dashboards to loan doctypes

* fix: Add Loan Manager role to loan doctypes

* fix: Loan Process fixes

* fix: Loan Security Unpledge fixes

* fix: UX, List and dashboards fixes

* fix: Minor fixes

* fix: Minor fixes

* fix: Status on additional loan security

* fix: Codacy fixes

* fix: Multiple fixes in loan

* fix: Rename Process Loan Security Price to Process Loan Security Shortfall

* fix: Loan Repayment and Closure report

* fix: Loan Security Status report and minor fixes

* fix: Multiple UX fixes

* fix: Test Case fixes and UX fixes

* fix: Currency symbol fixes in Salary Slip Loan

* fix: Make loan account details read only

* fix: Changes in loan security price updation

* fix: Sanctioned Loan Amount doctype

* fix: Updates in process loan interest accrual

* fix: Pass loan doc instead of loan name

* fix: Fixes in process loan interest accrual

* fix: Add missing semicolon

* fix: Test case

* fix: Test case

* fix: Sandbox method to get proposed pledges

* fix: Sandbox method

* fix: Nonetype fix in loan sanction limit

* fix: GL entry fixes

* fix: Update maximum loan amount on loan security pledging

* fix: Round  off loan amounts

* fix: Loan Security unpledging

* fix: Interest amount for loan closure

* fix: Due date for loan repayments

* fix: API fixes for loan disbursement method

* fix: Disable quick entry for sanctioned loan amount

* fix: Add misssing translations for validations and codecleanup

* fix: Translation fixes and code cleanup

* fix: Test Cases

* fix: Loan Interest Accrual test case
 2020-02-26 10:44:24 +05:30
Deepesh Garg
7f2ad5dd82
Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue 
fix: account dashboard not working
 2020-02-26 10:18:03 +05:30
Andy Zhu
75d9d79fac
fix: missing assign item's expense_account 
As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.
 2020-02-26 10:49:48 +13:00
Rucha Mahabal
41bd317e25 refactor: Patient Appointment status 2020-02-25 13:51:36 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return (#20543) 
* fix: Paid amount updation for pos return

* fix: Remove console

* fix: Styling

* fix: get  default mode of payment from POS profile

* fix: Add test cases

* fix: Codacy
 2020-02-25 13:21:16 +05:30
Rucha Mahabal
7c66975040 feat: validate Customer creation for Patient during Appointment booking 2020-02-25 12:43:33 +05:30
Rucha Mahabal
5100e11fb6 fix: appointment reminders not working 2020-02-24 22:08:45 +05:30
Rucha Mahabal
24055e1552 refactor: Patient Appointment 2020-02-24 19:09:50 +05:30
Rohit Waghchaure
ebdf80ddb5 fix: account dashboard not working 2020-02-24 18:45:47 +05:30
Deepesh Garg
735ec98b61
Merge pull request #20623 from jprashant09/develop 
fix: Future date of birth accepted at Sibling Detail section in Studen…
 2020-02-24 18:30:27 +05:30
Deepesh Garg
aaea4e60b6
fix: Validation condition 2020-02-23 20:59:05 +05:30
Deepesh Garg
dee42de0fd
Merge pull request #20596 from PratikM34/develop 
fix: restricted duplicate topics on Course doctype (#20594)
 2020-02-23 20:56:43 +05:30
Deepesh Garg
cd416bbaa6
Merge pull request #20617 from jsukrut/develop 
fix: restricted duplicate courses on Program Enrollment doctype (#20611)
 2020-02-23 20:51:08 +05:30
Himanshu
83acff9680
Merge branch 'develop' into opportunity-fix 2020-02-21 19:47:41 +05:30
Deepesh Garg
6e53afd947
fix: Travis (#20688) 
* fix: Travis

* fix: Update test records

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-20 23:33:35 +05:30
prssanna
3218730a16 fix: set query on change in opportunity_from value 2020-02-20 16:14:44 +05:30
Mangesh-Khairnar
1db8ea317d
Merge pull request #20687 from Anurag810/additional_salary_fixes_v13 
fix: Additional salary can be created only for active employee
 2020-02-20 16:07:35 +05:30
Anurag Mishra
3f0c01199d fix: Additional salary can be created only for active employee 2020-02-20 15:40:37 +05:30
Rohan
a29c87cfda
feat: remove unused route creation variable (#20558) 2020-02-20 13:28:03 +05:30
Mangesh-Khairnar
5d5f5b4f8e
fix(HR): skip earned leaves check for max leaves set to zero or less (#20535) 
* fix: skip earned leaves check for max leaves set to zero or less

* test: earned leaves creation
 2020-02-20 13:25:55 +05:30
Deepesh Garg
a871d30a7d
Merge pull request #20607 from khushalti/develop 
fix: validation on max group strength student group form
 2020-02-20 13:23:04 +05:30
Deepesh Garg
a0021969ad
fix: Validation message 2020-02-20 13:22:28 +05:30
Deepesh Garg
2c1da897c5
Merge pull request #20450 from Anurag810/fleet-management 
fix: odometer value was not syncing properly
 2020-02-20 13:19:54 +05:30
Rohan
395b2b15b2
fix: apply url encoding to project names (#20642) 2020-02-20 12:59:32 +05:30
Mangesh-Khairnar
6f6e3a940b
fix: return null for attribute (#20674) 2020-02-20 12:58:54 +05:30
Rucha Mahabal
6071313965
fix: document creation via onboarding slide (#20644) 
* fix: defaults not set in doc created via Onboarding Slide

* fix: default company not set in Supplier
 2020-02-20 12:57:21 +05:30
Anurag Mishra
51cf0eb159
fix: changed field type which was affecting filters (#20671) 2020-02-20 12:52:56 +05:30
Saqib
ca7f53b4ea
chore: SINV set_status remove redundant function calls (#20660) 
* chore: SINV set_status remove redundant function calls

* Update erpnext/accounts/doctype/sales_invoice/sales_invoice.py

Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-02-20 12:32:05 +05:30
Saqib
cfe2db6d77
fix: mandatory on hold comment for purchase invoice (#20666) 2020-02-20 12:29:44 +05:30
Mangesh-Khairnar
2d7e024f00
fix: use system language to translate strings (#20673) 2020-02-20 12:24:29 +05:30
Saqib
56837bc09d
fix: check for available stock in product bundle's website warehouse (#20681) 2020-02-20 12:23:08 +05:30
Deepesh Garg
cc56b690eb
Merge pull request #20582 from alyf-de/fix_datev 
fix(regional): update DATEV Export to DATEV-Format v7.0
 2020-02-19 19:36:45 +05:30
Deepesh Garg
6870161292
Merge pull request #20669 from Alchez/dev-priority-issue 
fix: show priority in Issue list view
 2020-02-19 19:28:23 +05:30
Deepesh Garg
23aa5c6332
Merge pull request #20643 from abhijitkumbharInd/develop 
fix: HSN/SAC Error while creating a new item and not selecting the fi…
 2020-02-19 19:23:10 +05:30
Deepesh Garg
ad246a4415
Merge pull request #19856 from alyf-de/skr03_gnucash 
feat(accounts): add german CoA "SKR03" (GnuCash)
 2020-02-19 19:21:51 +05:30
Deepesh Garg
40546d8af9
Merge pull request #20663 from marination/stock-settings-query 
fix: Set Query on warehouse fields in Stock Settings
 2020-02-19 18:57:24 +05:30
Anurag Mishra
1a11cb5a07 test: syncing of odometer value 2020-02-19 16:46:00 +05:30
Rohan Bansal
e5b59c781f fix: show priority in Issue list view 2020-02-19 13:13:24 +05:30
marination
120f75026f fix: Server side validation for Warehouses 2020-02-19 11:17:58 +05:30
Deepesh Garg
5632712d00
Merge pull request #20634 from scmmishra/tree-fix-qms-dev 
fix: filters for quality_procedure tree
 2020-02-19 09:41:18 +05:30
marination
bde13b98e0 fix: Set Query on warehouse fields in Stock Settings 2020-02-18 21:35:59 +05:30
Khushal Trivedi
8773dc3ffe fix: student max gropu cannot be zero or less than zero 2020-02-18 19:37:21 +05:30
Deepesh Garg
0a6314ab92
Merge pull request #20659 from deepeshgarg007/plaid_fix_develop 
fix: Plaid fixes and enhancements
 2020-02-18 18:09:01 +05:30
Deepesh Garg
16445305d5 fix: Styling and minor fixes 2020-02-18 18:04:09 +05:30
racitup
f2fb963986 Ignore codacy SQL injection warning (internal code only) and add copyright notice 2020-02-18 17:52:07 +05:30
racitup
805c3efa59 fix: manually added patch for bank reconciliatio fields since develop branch was in a different place 2020-02-18 17:51:47 +05:30
racitup
547a0bb909 fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions 2020-02-18 17:49:57 +05:30
racitup
719678957a fix: Bank Reconciliation Bank Account and Bank Account No field names 2020-02-18 17:49:45 +05:30
racitup
3c5bb80b5a fix: Plaid transaction import order, transaction_id duplicate check, added transaction category tags 2020-02-18 17:49:35 +05:30
racitup
9a47c3dc8c fix: Plaid automatic_synchronization TypeError on filter & add info log message #20343 2020-02-18 17:49:20 +05:30
racitup
1548e20b78 fix: KeyError about bank_account_no due to non-existent field: #20343 2020-02-18 17:49:08 +05:30
racitup
7cda218af3 fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343 2020-02-18 17:48:54 +05:30
Khushal Trivedi
3a196b09ee Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-18 17:48:18 +05:30
Deepesh Garg
33ad0dafcb
Merge pull request #20604 from AnilPise/develop 
fix: Parent Department filter while creating a new department
 2020-02-18 17:44:51 +05:30
Deepesh Garg
0ce9e0cc1f
feat: Group by AR/AP report (#20573) 
* feat: Group by AR/AP report

* fix: Do not consider total row in charts

* fix: Subtotal row for last party
 2020-02-18 16:07:34 +05:30
Deepesh Garg
ecba5c40bb
Merge pull request #20657 from anuradha-8/develop 
fix: date of birth cannot be greater than today on student application form
 2020-02-18 14:10:47 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix 
fix: disabled mode of payments fetches in sales invoices
 2020-02-18 12:38:06 +05:30
rohitwaghchaure
15ca1181f8
Merge pull request #20654 from marination/precision-mr-item 
fix: Stock Quantity not calculated on client side in Material Request Items.
 2020-02-18 12:34:16 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) 
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-18 12:28:41 +05:30
Anuradha Kalaskar
93e8fc1833 fix: date of birth cannot be greater than today on student application form 2020-02-18 11:32:35 +05:30
Khushal Trivedi
1153de1965 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-18 11:16:53 +05:30
marination
e143983819 fix: Stock Quantity not calculated on client side in Material Request Items. 2020-02-18 10:51:54 +05:30
P-Froggy
3cb9f4ab73 Add address and contact fields to bank 
Address and contact fields are enabled for DocType Bank
 2020-02-18 02:14:03 +01:00
P-Froggy
e4d8ee5ba8 Revert "Added bank account reference in supplier dashboard" 
This reverts commit 7ee8a20964.
 2020-02-18 01:05:19 +01:00
P-Froggy
4cc929cabb Move SWIFT-number and branch-code from bank account to bank 
The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.
 2020-02-18 00:38:46 +01:00
abhijitkumbharIND
0047fcf7ad fix: HSN/SAC Error while creating a new item and not selecting the field. #20590 2020-02-17 18:12:58 +05:30
P-Froggy
7ccb8b6707 Revert "Merge pull request #1 from P-Froggy/patch-1" 
This reverts commit 79c5266d0d, reversing
changes made to bd582cfc39.
 2020-02-17 11:33:10 +01:00
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371) 
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order

* fix: Query with filters, UX enhancements and cleanup
 2020-02-17 15:58:08 +05:30
indictrans
68fa65edd1 fix: Throw message 2020-02-17 14:55:56 +05:30
indictrans
a840889dd7 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-17 14:46:40 +05:30
thefalconx33
23e728612f fix: disabled mode of payments fetches in sales invoices 2020-02-17 14:15:20 +05:30
Deepesh Garg
a6701aa7bc
Merge pull request #20569 from Er-Naren719/feat-user-table-columns-updated 
feat: columns under user table updated
 2020-02-17 11:15:05 +05:30
Shivam Mishra
c14f49c079 fix: filters for quality_procedure tree 2020-02-17 11:12:28 +05:30
Deepesh Garg
5894c2d005
Merge pull request #20595 from anuradha-8/develop 
fix: to date cannot be less than from date validation on student leave application form
 2020-02-17 10:57:29 +05:30
Deepesh Garg
fd182b80ac
Merge pull request #20616 from Darpan245/develop 
fix: Mandatory field property failed to work based on the selection of…
 2020-02-17 10:35:56 +05:30
P-Froggy
7ee8a20964 Added bank account reference in supplier dashboard 2020-02-17 00:15:29 +01:00
P-Froggy
ab92e330da
Fix: Wrong filter for supplier default bank account 
The query for default bank account field in the supplier master only allowed company bank accounts. With this fix it's now possible to one of the supplier bank accounts as default bank account.
 2020-02-16 23:08:32 +01:00
P-Froggy
b3712158ae
Bank accounts reference in supplier dashboard 
Adds a reference to linked bank accounts in supplier dashboard, which was previously missing.
 2020-02-16 19:10:53 +01:00
indictrans
ad5da823e1 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-16 22:59:41 +05:30
shrikant dixit
e329d417d6 fix: Added validation for student DOB can not be greater than Joining Date 2020-02-15 18:20:05 +05:30
indictrans
1118ee07a8 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-15 17:37:39 +05:30
jsukrut
c0fd30a7ec fix: Indentation 2020-02-15 17:33:52 +05:30
jsukrut
c3a23ddbe3 fix: restricted duplicate courses on Program Enrollment doctype (#20611) 2020-02-15 16:39:51 +05:30
Yugandhara
ce1f6a73e2 fix: Changes done to get valid sales order list on production plan form(#20609) 2020-02-15 16:31:53 +05:30
jsukrut
3a6ca13b44 fix:Mandatory field property failed to work based on the selection of field 'Group Based on' on 'Student Group' Page #20605 2020-02-15 16:18:17 +05:30
Yugandhara
e997168a23 fix: unused variable cdn removed 2020-02-15 16:14:46 +05:30
Yugandhara
af2b39891e fix: Changes done to get valid sales order list on sales order child table of production plan 2020-02-15 16:01:41 +05:30
anil pise
7c474130ea fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed. 2020-02-15 15:58:57 +05:30
Khushal Trivedi
dc39b4ba13 fix: validation on max group strength student group form 2020-02-15 15:38:16 +05:30
anil pise
21b1a00f61 Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599 2020-02-15 15:23:15 +05:30
pratik.m
c224cf761f fix: restricted duplicate topics on Course doctype (#20594) 2020-02-15 13:22:17 +05:30
Anuradha Kalaskar
21d662f96d fix: to date cannot be less than from date validation on student leave application 2020-02-15 13:17:57 +05:30
Yugandhara
ad645afeb2 fix: Changes done to get valid customer and employee list on payment entry form 2020-02-15 10:56:41 +05:30
Raffael Meyer
772394b95a fix header 2020-02-13 20:58:59 +01:00
Raffael Meyer
54717fa993 update cloumn names 2020-02-13 20:58:44 +01:00
Raffael Meyer
3bacdf1f4b quote format name 2020-02-13 20:40:15 +01:00
Raffael Meyer
96b66dfae6 update TRANSACTION_COLUMNS according to "DATEV Format v7.0" 2020-02-13 20:37:37 +01:00
Raffael Meyer
b555ed0cba update header accoding to "DATEV Format v7.0" 2020-02-13 20:05:27 +01:00
Raffael Meyer
8818850174 consutant number and client number are mandatory 2020-02-13 17:13:15 +01:00
Raffael Meyer
46cf20825b generated on is datetime, not date 2020-02-13 17:09:22 +01:00
Raffael Meyer
0070805bbb add format version (data type) 2020-02-13 17:06:06 +01:00
Raffael Meyer
7d2777870e bump version number 2020-02-13 17:05:37 +01:00
Raffael Meyer
4fb897728b EXTF must be in quotes 2020-02-13 17:02:01 +01:00
rohitwaghchaure
c2c12dc82f
Merge pull request #20572 from abhijitkumbharInd/develop 
Production Plan | Get items from Sales Order not fetching grand total value
 2020-02-13 10:09:24 +05:30
Raffael Meyer
0fac1f9429 Add groups for account types "Bank" and "Cash" 2020-02-12 13:59:48 +01:00
Raffael Meyer
cad404c355 Merge branch 'develop' into skr03_gnucash 2020-02-12 13:58:53 +01:00
Himanshu Mishra
b76d2d4d98
Fix: Syntax error in get_child_warehouses 2020-02-12 13:22:05 +05:30
rohitwaghchaure
490b843ecf
Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop 2020-02-11 19:56:11 +05:30
rohitwaghchaure
3d98c59585
Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush 
fix: backflush raw material based on - Material Transferred for Manufacture
 2020-02-11 19:50:36 +05:30
abhijitkumbharIND
a67ae3ad31 fix: Production Plan | Get items from Sales Order not fetching grand total value. #20568 2020-02-11 16:45:59 +05:30
Rucha Mahabal
ba740ff558 feat: show linked Sales Invoice in Patient Appointment after booking 2020-02-11 16:27:22 +05:30
Er-Naren719
94e14257fb feat: column width increased for view attachments field (#314) 2020-02-11 15:21:48 +05:30
Deepesh Garg
65a53ba86c
Merge pull request #20565 from vishdha/filter_serial_based_on_batch_v13 
fix: filter serial no based on batch no
 2020-02-11 13:45:21 +05:30
Deepesh Garg
93b98774e7
Merge pull request #20519 from ahmad18189/patch-3 
automatic booking of asset depreciation fix
 2020-02-11 13:44:29 +05:30
Rucha Mahabal
4dd6f0ae9b fix: non-empty service unit set as empty after booking appointment 2020-02-11 13:39:18 +05:30
vishal
998de83d48 fix: filter serial no based on batch no 2020-02-11 12:24:44 +05:30
Deepesh Garg
97669e975d
fix: Update condition 2020-02-11 10:18:39 +05:30
Deepesh Garg
c688f9f584
Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop 
fix: added indexing on columns to fix performace issue
 2020-02-11 10:12:49 +05:30
Deepesh Garg
9462ba6559
feat: Group by item wise sales register (#20251) 
* fix: Group by sales register report

* fix: Remove group-by item

* fix: Grand total query fix

* fix: Remove debug param

* fix: Code cleanup and commonification

* fix: Add group by functionality to purchase register

* fix: Changes in total row display

* fix: Minor fixes

* fix: Add total row

* fix: Do not calculate total for rate
 2020-02-10 17:59:17 +05:30
Rohit Waghchaure
50886f02c3 fix: added indexing on columns to fix performace issue 2020-02-10 15:56:56 +05:30
Rohit Waghchaure
e55a927eee fix: test cases 2020-02-10 14:39:26 +05:30
Deepesh Garg
930e61d6e3 Merge pull request #20549 from nextchamp-saqib/so-update-items-warehouse-fix 
fix: mandatory warehouse wrror while updating items after submission
 2020-02-10 12:09:11 +05:30
ashish-greycube
121636f9bf fix: backflush raw material based on - Material Transferred for Manufacture 2020-02-10 10:49:50 +05:30
Rucha Mahabal
cf3c8174f6
Merge branch 'develop' into fix_regional_data 2020-02-10 00:40:21 +05:30
Rucha Mahabal
8334a3a1fd fix: patch for creating irs_1099 custom field (United States) 2020-02-10 00:34:09 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups (#20547) 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-09 21:23:53 +05:30
thefalconx33
9225159d8c fix: mandatory warehouse wrror while updating items after submission 2020-02-09 12:19:03 +05:30
Rohit Waghchaure
f0d27528e3 fix: time out error while submitting the purchase receipt which has more than 100 serial nos 2020-02-07 14:42:33 +05:30
Deepesh Garg
ed5c05b0f7
Merge pull request #20533 from rohitwaghchaure/procurement_tracker_not_working_for_special_char_company_name 
fix: Procurement Tracker report not working
 2020-02-07 10:43:11 +05:30
Rohan Bansal
d64f92cf99 fix: show WFH in monthly attendance sheet report 2020-02-06 17:30:57 +05:30
Rohit Waghchaure
07f3312804 fix: Procurement Tracker report not working 2020-02-06 14:34:11 +05:30
Deepesh Garg
eeb4c3629c
Merge pull request #20529 from nextchamp-saqib/mv-fix-develop 
fix: typo; serial no doesn't have amc start date
 2020-02-06 13:56:10 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline 
feat: add territory wise sales report
 2020-02-06 13:11:07 +05:30
thefalconx33
fcae88a514 fix: typo; serial no doesn't have amc start date 2020-02-06 13:00:47 +05:30
Deepesh Garg
da406d74ef
fix: Remove debug param 2020-02-06 12:55:21 +05:30
Deepesh Garg
a4928f6f5b fix: Add report link in module view and fix date filter 2020-02-06 12:50:25 +05:30
Parth J. Kharwar
830b316543
fix: full day leaves not tagged as half day in attendance (#20487) 
* fix: full day leaves not tagged as half day in attendance

* chore: code cleanup for half day date value set
 2020-02-05 15:01:13 +05:30
0Pranav
9d9a3d85d8 fix: filters after rename 2020-02-05 14:17:21 +05:30
Anurag Mishra
eacc1bc2dc fix: requested changes 2020-02-05 12:45:43 +05:30
Deepesh Garg
30e766b228 fix: SQL query in financial statements 2020-02-05 12:12:47 +05:30
Ahmad M Abdelrahman
41e7163476
automatic booking of asset depreciation fix 
Stop Automatic deprecation is not working
 2020-02-05 08:33:53 +02:00
Rucha Mahabal
50b67792ca fix: remove check availability button from form 2020-02-03 23:45:14 +05:30
Rucha Mahabal
513b443861 fix: make check availability as the primary action button 2020-02-03 23:42:21 +05:30
Rucha Mahabal
4d9d51d91c fix: get prescribed procedures button not working 2020-02-03 22:29:32 +05:30
Rucha Mahabal
217e1b41fb refactor: Appointment Type, add dashboard 2020-02-03 21:55:52 +05:30
Rucha Mahabal
6ffdbcbcd7 feat: show Patient Appointment status in List View 2020-02-03 21:23:02 +05:30
Deepesh Garg
d8e57d3d5a
fix: Unable to submit landed cost voucher (#20493) 
* fix: Unable to submit landed cost voucher

* fix: Test case for multiple landed cost voucher against a Purchase receipt

* fix: Test Case
 2020-02-03 18:53:34 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter (#20104) 
* feat: appointment Letter

* fix: requested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-03 17:52:42 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
rohitwaghchaure
716a85d81a
Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order 
feat: added source warehouse field in the work order
 2020-02-03 16:32:19 +05:30
Himanshu
10b3b79c0f
fix(Report): query report for Quality Action (#20424) 
* fix: query report for QA

* fix: add QM permission

* fix: add QM permission
 2020-02-03 16:16:49 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer (#20465) 
* fix: Label and UX fixes while creating payment entry against customer

* fix: filter
 2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile (#20413) 
* feat: add tax category in pos profile

* fix: review fixes
 2020-02-03 15:53:27 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements (#20486) 2020-02-03 15:49:24 +05:30
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code (#20500) 
* fix: gst permission for gst settings & hsn code

* Fix: typo

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-02-03 15:40:35 +05:30
Frappe PR Bot
ba0712a429
feat: Updated translation (#20490) 2020-02-03 14:58:03 +05:30
Frappe PR Bot
1478282920
feat: Updated translation (#20499) 2020-02-03 14:57:43 +05:30
0Pranav
9c4399e1f2 fix: better syntax for checking empty arrays 2020-02-03 14:57:42 +05:30
Deepesh Garg
943de261bb
Merge pull request #20505 from deepeshgarg007/button_shift 
fix: Move E-Way bill button under create
 2020-02-03 14:50:54 +05:30
Rucha Mahabal
b010988033 feat: add dashboards to Healthcare Masters 2020-02-02 23:22:02 +05:30
Rucha Mahabal
0a35b2207e refactor: Healthcare masters 2020-02-02 23:21:18 +05:30
Deepesh Garg
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application 
feat: request for work from home marked in attendance
 2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6 fix: test added to check work from home application 2020-01-31 14:30:38 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new 
fix: Do not show any finance book record if no finance book filter is applied
 2020-01-31 13:19:16 +05:30
Rohit Waghchaure
adbe291498 feat: added source warehouse field in the work order 2020-01-31 13:09:06 +05:30
Rucha Mahabal
d089029bb4 fix: disabled practitioner schedule shown as enabled in list view 2020-01-31 12:32:42 +05:30
Deepesh Garg
34c33baa82 fix: Cash flow filter fix 2020-01-31 11:16:30 +05:30
0Pranav
b1473c3de0 fix: return empty array 2020-01-31 10:43:00 +05:30
0Pranav
75adb808e5 various fixes from review 
- Rename the report to title case
- Added company filter
- fixed checks in filter and += operator for total
 2020-01-31 10:35:47 +05:30
Deepesh Garg
ba44f28202 fix: Filtering fixes in financial statement 2020-01-31 09:08:29 +05:30
Deepesh Garg
ce04526db8 fix: Do not show any finance book record if no finance book filter is applied 2020-01-30 15:33:51 +05:30
Suraj Shetty
0860865763
Merge branch 'develop' into fix-incorrect-translations 2020-01-30 15:12:33 +05:30
Parth Kharwar
5342c846d2 feat: request for work from home marked in attendance 2020-01-30 13:12:56 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test 2020-01-30 13:03:05 +05:30
Parth Kharwar
2bccd7f717 fix: rename breadcrumb for Brand DocType from Selling to Stock 2020-01-30 12:12:42 +05:30
Suraj Shetty
082020184a Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-30 10:46:11 +05:30
Raffael Meyer
e21cd5e7f1 fix: account number for "Kasse" 2020-01-29 23:39:55 +01:00
Raffael Meyer
3716434218 fix: add missing account types 2020-01-29 22:21:19 +01:00
Rucha Mahabal
be29a24de5 refactor: Patient master 2020-01-29 22:22:39 +05:30
Deepesh Garg
d89fbc56d9
Merge pull request #20464 from Alchez/dev-wfh 
feat(hr): add work from home option in status
 2020-01-29 20:12:40 +05:30
Diksha
480d52c6f3 feat(attendance): add work from home option in status 2020-01-29 17:46:27 +05:30
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pranav Nachnekar
d64135b2d2
fix: linking party in calendar event of appointment (#20458) 2020-01-29 13:01:25 +05:30
Rucha Mahabal
a4202d1660 fix: disabled patient shown as enabled 2020-01-29 11:33:29 +05:30
Deepesh Garg
47ba65edc0
Merge pull request #20459 from 0Pranav/fix-supplier-quotation-button 
fix: missing plus button in request for quotaion for supplier quotation
 2020-01-29 10:46:21 +05:30
Deepesh Garg
565a810bf7
Merge pull request #20454 from marination/stock-ledger-qty-column 
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
 2020-01-29 09:49:55 +05:30
Deepesh Garg
b61b8d7ced
fix: Remove comma 2020-01-29 09:49:26 +05:30
0Pranav
d4c0184f3f fix: missing plus button in request for quotaion for supplier quotation 2020-01-29 09:32:40 +05:30
Deepesh Garg
217517a61f
Merge pull request #20455 from toxnico/develop 
fix: french translation correction
 2020-01-29 08:39:38 +05:30
Rucha Mahabal
c7417c08ed refactor: Healthcare Settings 2020-01-28 18:06:23 +05:30
Pranav Nachnekar
c1312700e8 feat: create appoitnemnt against customer (#20457) 2020-01-28 17:50:47 +05:30
Nicolas Simonnet
10ffaf4e89 french translation correction 2020-01-28 11:45:57 +01:00
marination
372c5e51d5 fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger 2020-01-28 16:04:49 +05:30
rohitwaghchaure
da9a3936e1 fix: incorrect work order qty for sub assembly items (#20449) 2020-01-28 14:34:27 +05:30
Nabin Hait
2bb3a62b1a
fix: cannot complete task if dependent task are not completed / cancelled (#20437) 2020-01-28 14:08:53 +05:30
Anurag Mishra
3496104ebe fix: odometer value was not syncing properly 2020-01-28 13:11:49 +05:30
Deepesh Garg
cd8d667861 fix: Parent company defaulting on creation of new company (#20422) 
* fix: Parent company defaulting on creation of new company

* fix: Test Cases

* fix: Test Cases

* fix: Test Cases for staffing plan
 2020-01-28 12:54:45 +05:30
Pranav Nachnekar
3fb48ebf61 fix: discounting not applied on sales invoice created by subscriptions (#20431) 2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f fix: Column 'project' in where clause is ambiguous (#20438) 
* fix: Column 'project' in where clause is ambiguous

* fix: Fixed alias in query
 2020-01-28 12:43:38 +05:30
Deepesh Garg
0c31d62edd
Merge pull request #20447 from Alchez/dev-driver-address-fetch 
fix: only fetch driver address if not set (develop)
 2020-01-28 09:20:26 +05:30
Don-Leopardo
f6d5073832
Merge branch 'develop' into fix_sqlinjection_develop 2020-01-27 13:56:01 -03:00
rohitwaghchaure
7fda3a12cc
Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item 
fix: to warehouse not set in the customer warehouse
 2020-01-27 19:29:19 +05:30
Rohan Bansal
ce17a546b9 fix: only fetch driver address if not set 2020-01-27 18:08:11 +05:30
Rohit Waghchaure
2dff28498f fix: to warehouse not set in the customer warehouse 2020-01-27 17:56:25 +05:30
NahuelOperto
be1895fd08 Fix sql injection 2020-01-27 09:02:02 -03:00
Saqib
e009187e02 refac: filters and columns of fixed asset register report (#20332) 2020-01-27 16:05:55 +05:30
Parth J. Kharwar
011c13b3cc fix: employee checkin doctype time permissions (#20403) 2020-01-27 16:03:24 +05:30
Shivam Mishra
149b4e5985 chore: warn bom naming conflict (#20244) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-01-27 15:20:30 +05:30
Deepesh Garg
ef41a0eda5 fix: Finance book filtering in financial statements (#20410) 
* fix: Finance book filtering in financial statements

* fix: Use IS NULL instead of ifnull
 2020-01-27 15:18:51 +05:30
Saqib
9cb02bf2e1 fix: incorrect status for fraction of outstanding amount (#20369) 2020-01-27 14:22:43 +05:30
Himanshu Warekar
e169d2964c fix: change fieldtype to Text 2020-01-24 17:40:29 +05:30
Saqib
9291df4d4c fix: wrong outstanding invoices fetched against employee (#20373) 2020-01-24 16:22:49 +05:30
Anurag Mishra
ce00f6cf70 fix: Duplicate Attendance Due Wrong Date format (#20390) 2020-01-24 16:14:50 +05:30
Rucha Mahabal
0a27c98a99 fix(Healthcare): disabled Lab Test Template shown as Enabled in List View (#20378) 
* fix (Healthcare): disabled Lab Test Template shown as enabled in List View

* fix: remove custom disabled button and unhide disabled field
 2020-01-24 16:12:08 +05:30
Marica
40dffab79e fix: Product Page non-stock item status (#20383) 2020-01-24 15:52:27 +05:30
Rucha Mahabal
72c3dd1d11 fix: healthcare settings registration fee NoneType error (#20395) 2020-01-24 15:50:44 +05:30
Frappe PR Bot
84afdfdb4c feat: Updated translation (#20404) 2020-01-24 14:21:53 +05:30
rohitwaghchaure
573de02f60
Merge pull request #20398 from rohitwaghchaure/fixed_serial_no_button_not_working_develop 
fix: add serial no button not working
 2020-01-24 13:49:41 +05:30
Deepesh Garg
60e8d52f32
Merge pull request #20401 from deepeshgarg007/general_ledger_sort 
fix: Order GL entries by creation time in General ledger
 2020-01-24 13:19:39 +05:30
Deepesh Garg
1e77a1374d
Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop 
fix: unlink references from batch on cancellation of stock transactions
 2020-01-23 22:40:26 +05:30
Rohit Waghchaure
8996b7d8a4 delete the auto created batch 2020-01-23 17:44:19 +05:30
deepeshgarg007
fdba26d476 fix: Order GL entries by creation time in General ledger 2020-01-23 17:42:57 +05:30
Rohit Waghchaure
067e8ad50d fix: add serial no button not working 2020-01-23 15:49:39 +05:30
Deepesh Garg
f2d3bd71c9
Merge pull request #20356 from abhijitkumbharInd/develop 
fix: Gives a 404 error when clicked on the Download Required Material…
 2020-01-23 15:45:42 +05:30
Deepesh Garg
1d279c30bb
Merge pull request #20386 from rohitwaghchaure/fixed_lead_date_comparision_issue_develop 
fix: lead date comparison issue
 2020-01-23 15:22:53 +05:30
Deepesh Garg
b83f5cee6c
Merge pull request #20388 from rohitwaghchaure/lead_showing_two_times_in_the_report_develop 
fix: lead details duplicate entries
 2020-01-23 15:20:47 +05:30
Deepesh Garg
32be74e40d
Merge pull request #20381 from nextchamp-saqib/small-fix-asset 
fix: tuple index out of range error
 2020-01-23 15:03:00 +05:30
Rohit Waghchaure
4f4dbf1996 fix: unlink references from batch on cacnellation of stock transactions 2020-01-23 12:45:45 +05:30
Rohit Waghchaure
0251e33f31 fix: lead details duplicate entries 2020-01-22 16:59:36 +05:30